aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael J. Spencer <bigcheesegs@gmail.com>2010-10-07 18:29:44 +0000
committerMichael J. Spencer <bigcheesegs@gmail.com>2010-10-07 18:29:44 +0000
commit6b17830980093a765d99696048c82b2ec53a8a3c (patch)
tree2ec61ff502dc3ec3b938b6270908652f904308b7
parent1cade330affc01142f43e8c46a8e34278740ad53 (diff)
gtest: Fix warnings on MinGW.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@115945 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--utils/unittest/googletest/gtest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/utils/unittest/googletest/gtest.cc b/utils/unittest/googletest/gtest.cc
index 6e291aee50..51732afd49 100644
--- a/utils/unittest/googletest/gtest.cc
+++ b/utils/unittest/googletest/gtest.cc
@@ -1964,8 +1964,8 @@ void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
} // namespace internal
-#if GTEST_OS_WINDOWS
-// We are on Windows.
+#if GTEST_HAS_SEH
+// We are on Windows with SEH.
// Adds an "exception thrown" fatal failure to the current test.
static void AddExceptionThrownFailure(DWORD exception_code,
@@ -1978,7 +1978,7 @@ static void AddExceptionThrownFailure(DWORD exception_code,
message.GetString());
}
-#endif // GTEST_OS_WINDOWS
+#endif // GTEST_HAS_SEH
// Google Test requires all tests in the same test case to use the same test
// fixture class. This function checks if the current test has the