aboutsummaryrefslogtreecommitdiffstats
path: root/googletest/test
diff options
context:
space:
mode:
authorArkadiy Shapkin <arkady.shapkin@gmail.com>2016-09-05 00:57:49 +0300
committerArkadiy Shapkin <arkady.shapkin@gmail.com>2016-09-05 00:57:49 +0300
commitd8fe70f477d8a99745b69f7650f75eacf96866f9 (patch)
tree7783eecaaf18e73d329c9a7cf42fd480b55734a8 /googletest/test
parented9d1e1ff92ce199de5ca2667a667cd0a368482a (diff)
downloadgoogletest-d8fe70f477d8a99745b69f7650f75eacf96866f9.tar.gz
googletest-d8fe70f477d8a99745b69f7650f75eacf96866f9.tar.bz2
googletest-d8fe70f477d8a99745b69f7650f75eacf96866f9.zip
Fix build with MinGW-w64
Diffstat (limited to 'googletest/test')
-rw-r--r--googletest/test/gtest-port_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/test/gtest-port_test.cc b/googletest/test/gtest-port_test.cc
index 05f8821e..c5067a40 100644
--- a/googletest/test/gtest-port_test.cc
+++ b/googletest/test/gtest-port_test.cc
@@ -1295,7 +1295,7 @@ TEST(WindowsTypesTest, HANDLEIsVoidStar) {
StaticAssertTypeEq<HANDLE, void*>();
}
-#if GTEST_OS_WINDOWS_MINGW
+#if GTEST_OS_WINDOWS_MINGW && !defined(__MINGW64_VERSION_MAJOR)
TEST(WindowsTypesTest, _CRITICAL_SECTIONIs_CRITICAL_SECTION) {
StaticAssertTypeEq<CRITICAL_SECTION, _CRITICAL_SECTION>();
}