[llvm] r291038 - Patch gtest to move GTEST_IS_THREADSAFE out of unrelated GTEST_HAS_SEH ifdef

[Reid Kleckner via llvm-commits]

Author: rnk
Date: Wed Jan  4 18:00:05 2017
New Revision: 291038

URL: http://llvm.org/viewvc/llvm-project?rev=291038&view=rev
Log:
Patch gtest to move GTEST_IS_THREADSAFE out of unrelated GTEST_HAS_SEH ifdef

Fixes the sanitizer Windows build, which happens to set
-DGTEST_HAS_SEH=0.

Modified:
    llvm/trunk/utils/unittest/googletest/include/gtest/internal/gtest-port.h

Modified: llvm/trunk/utils/unittest/googletest/include/gtest/internal/gtest-port.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/googletest/include/gtest/internal/gtest-port.h?rev=291038&r1=291037&r2=291038&view=diff
==============================================================================
--- llvm/trunk/utils/unittest/googletest/include/gtest/internal/gtest-port.h (original)
+++ llvm/trunk/utils/unittest/googletest/include/gtest/internal/gtest-port.h Wed Jan  4 18:00:05 2017
@@ -916,13 +916,13 @@ using ::std::tuple_size;
 #  define GTEST_HAS_SEH 0
 # endif
 
+#endif  // GTEST_HAS_SEH
+
 #define GTEST_IS_THREADSAFE \
     (GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ \
      || (GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT) \
      || GTEST_HAS_PTHREAD)
 
-#endif  // GTEST_HAS_SEH
-
 #ifdef _MSC_VER
 # if GTEST_LINKED_AS_SHARED_LIBRARY
 #  define GTEST_API_ __declspec(dllimport)