Skip to content

Commit

Permalink
Patch gtest to move GTEST_IS_THREADSAFE out of unrelated GTEST_HAS_SE…
Browse files Browse the repository at this point in the history
…H 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
  • Loading branch information
rnk committed Jan 5, 2017
1 parent d251951 commit eb7f57f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions utils/unittest/googletest/include/gtest/internal/gtest-port.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit eb7f57f

Please sign in to comment.