From eb7f57f21dcd49c22a016c89a1421f975c1a6976 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Thu, 5 Jan 2017 00:00:05 +0000 Subject: [PATCH] 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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@291038 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/unittest/googletest/include/gtest/internal/gtest-port.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/unittest/googletest/include/gtest/internal/gtest-port.h b/utils/unittest/googletest/include/gtest/internal/gtest-port.h index 99f7c6e66a8..43d377bbcdc 100644 --- a/utils/unittest/googletest/include/gtest/internal/gtest-port.h +++ b/utils/unittest/googletest/include/gtest/internal/gtest-port.h @@ -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)