diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-15 01:44:03 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-15 01:44:03 +0000 |
| commit | e5b3c22d05cdb76c2b6a6be4e05143e96daa7866 (patch) | |
| tree | 28e5b6c8aa12c30d1e1601e37ad4c1407a8fe480 /base/win | |
| parent | 8533e24ea001d584308febaf9a65e8d5bece8431 (diff) | |
| download | chromium_src-e5b3c22d05cdb76c2b6a6be4e05143e96daa7866.zip chromium_src-e5b3c22d05cdb76c2b6a6be4e05143e96daa7866.tar.gz chromium_src-e5b3c22d05cdb76c2b6a6be4e05143e96daa7866.tar.bz2 | |
fix erroring out on win x64 due to bad compiler version check
Compiler version of x64 compiler did not change at update 1. 'Helpfully', #error on the x64 compiler emits "unexpected end-of-file found" rather than something useful. :/
R=ukai@chromium.org
TBR=cpu@chromium.org
BUG=196438
Review URL: https://codereview.chromium.org/12465017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188241 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/win')
| -rw-r--r-- | base/win/win_util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/win/win_util.cc b/base/win/win_util.cc index c54a7db..774b11d 100644 --- a/base/win/win_util.cc +++ b/base/win/win_util.cc @@ -332,8 +332,8 @@ bool DismissVirtualKeyboard() { #ifdef _MSC_VER -// There are optimizer bugs in VS2012 pre-Update 1. -#if _MSC_VER == 1700 && _MSC_FULL_VER < 170051106 +// There are optimizer bugs in x86 VS2012 pre-Update 1. +#if _MSC_VER == 1700 && defined _M_IX86 && _MSC_FULL_VER < 170051106 #error Must install Update 1 to Visual Studio 2012. #endif |