diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 00:35:23 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 00:35:23 +0000 |
| commit | 42b19f496332a5f8b9abbc31db108a4e9a46e778 (patch) | |
| tree | b67de2ca7f3b2c250c9bf28df69ce0cc44065764 /chrome_frame | |
| parent | 3f1719b28d123e1bbc52d03b9d68ff247a54da8d (diff) | |
| download | chromium_src-42b19f496332a5f8b9abbc31db108a4e9a46e778.zip chromium_src-42b19f496332a5f8b9abbc31db108a4e9a46e778.tar.gz chromium_src-42b19f496332a5f8b9abbc31db108a4e9a46e778.tar.bz2 | |
Fix compilation on 2013 debug due to ATL changes
Fixes http://build.chromium.org/p/chromium.fyi/builders/Chromium%20Win%20VS2013%20%28dbg%29/builds/101/steps/compile/logs/stdio
R=robertshield@chromium.org
BUG=309197
Review URL: https://codereview.chromium.org/71963002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234981 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_tab.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc index d54d73c..b3c2099 100644 --- a/chrome_frame/chrome_tab.cc +++ b/chrome_frame/chrome_tab.cc @@ -893,7 +893,7 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE instance, LPVOID reserved) { UNREFERENCED_PARAMETER(instance); if (reason == DLL_PROCESS_ATTACH) { -#ifndef NDEBUG +#if _ATL_VER < 0x0C00 && !defined(NDEBUG) // Silence traces from the ATL registrar to reduce the log noise. ATL::CTrace::s_trace.ChangeCategory(atlTraceRegistrar, 0, ATLTRACESTATUS_DISABLED); |