diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-26 21:19:05 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-26 21:19:05 +0000 |
| commit | a99f8a8272dd261bc4d097b543a1306095173d8e (patch) | |
| tree | 131094aa2f368904c81be805a85bc046d66a35a0 /base/win | |
| parent | 31f509ed8b8a611d08687f56beb4b0b752cb9ee8 (diff) | |
| download | chromium_src-a99f8a8272dd261bc4d097b543a1306095173d8e.zip chromium_src-a99f8a8272dd261bc4d097b543a1306095173d8e.tar.gz chromium_src-a99f8a8272dd261bc4d097b543a1306095173d8e.tar.bz2 | |
Better fix for http://codereview.chromium.org/10661041/
While the previous works, this one actually makes sense.
BUG=127799
TEST=it builds
Review URL: https://chromiumcodereview.appspot.com/10662040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144277 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/win')
| -rw-r--r-- | base/win/pe_image.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/base/win/pe_image.h b/base/win/pe_image.h index 5d39625..72d37f8 100644 --- a/base/win/pe_image.h +++ b/base/win/pe_image.h @@ -14,12 +14,11 @@ #include <windows.h> -#if _MSC_VER <= 1600 -// The windows SDK now defines in FACILITY_VISUALCPP winerror.h which -// clashes with the older crt's definition of the same. +#if defined(_WIN32_WINNT_WIN8) +// The Windows 8 SDK defines FACILITY_VISUALCPP in winerror.h. #undef FACILITY_VISUALCPP -#include <DelayIMP.h> #endif +#include <DelayIMP.h> namespace base { namespace win { |