diff options
Diffstat (limited to 'test/gmock-matchers_test.cc')
| -rw-r--r-- | test/gmock-matchers_test.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/gmock-matchers_test.cc b/test/gmock-matchers_test.cc index bd20add2..68a027bf 100644 --- a/test/gmock-matchers_test.cc +++ b/test/gmock-matchers_test.cc @@ -33,6 +33,10 @@ // // This file tests some commonly used argument matchers. +// windows.h defines macros which conflict with standard identifiers used in +// this test. Defining this symbol prevents windows.h from doing that. +#define NOMINMAX + #include "gmock/gmock-matchers.h" #include "gmock/gmock-more-matchers.h" |