aboutsummaryrefslogtreecommitdiff
path: root/src/client/windows
diff options
context:
space:
mode:
authorted.mielczarek@gmail.com <ted.mielczarek@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e>2013-03-29 14:39:55 +0000
committerted.mielczarek@gmail.com <ted.mielczarek@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e>2013-03-29 14:39:55 +0000
commitcd0eb0f8dc0f9cceb370407ba1fa876238951af5 (patch)
tree297920239dd091f7159753faf1f58b9797139e11 /src/client/windows
parentFix three unit tests on recent ARM devices. (diff)
downloadbreakpad-cd0eb0f8dc0f9cceb370407ba1fa876238951af5.tar.xz
Fix Windows unittest build on VC2012
R=mark at https://breakpad.appspot.com/539003/ git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1133 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/client/windows')
-rw-r--r--src/client/windows/unittests/testing.gyp11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/client/windows/unittests/testing.gyp b/src/client/windows/unittests/testing.gyp
index 2630264e..3234f46c 100644
--- a/src/client/windows/unittests/testing.gyp
+++ b/src/client/windows/unittests/testing.gyp
@@ -49,8 +49,13 @@
'include_dirs': [
'<(DEPTH)/testing/include',
'<(DEPTH)/testing/gtest/include',
- ]
+ ],
+ # Visual C++ implements variadic templates strangely, and
+ # VC++2012 broke Google Test by lowering this value. See
+ # http://stackoverflow.com/questions/12558327/google-test-in-visual-studio-2012
+ 'defines': ['_VARIADIC_MAX=10'],
},
+ 'defines': ['_VARIADIC_MAX=10'],
},
{
'target_name': 'gmock',
@@ -69,8 +74,10 @@
'include_dirs': [
'<(DEPTH)/testing/include',
'<(DEPTH)/testing/gtest/include',
- ]
+ ],
+ 'defines': ['_VARIADIC_MAX=10'],
},
+ 'defines': ['_VARIADIC_MAX=10'],
},
],