diff options
| author | Reid Kleckner <rnk@google.com> | 2017-01-05 00:00:05 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2017-01-05 00:00:05 +0000 |
| commit | 3dcb61f0bbc10166a6b024b7109d181239105e2e (patch) | |
| tree | d083fea454dca4c0df4c00637cadb70936cc8499 /llvm/utils/unittest/googletest/include | |
| parent | ce13e716c59a48e341208e5041263aae8b07e1e8 (diff) | |
| download | bcm5719-llvm-3dcb61f0bbc10166a6b024b7109d181239105e2e.tar.gz bcm5719-llvm-3dcb61f0bbc10166a6b024b7109d181239105e2e.zip | |
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.
llvm-svn: 291038
Diffstat (limited to 'llvm/utils/unittest/googletest/include')
| -rw-r--r-- | llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h index 99f7c6e66a8..43d377bbcdc 100644 --- a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h +++ b/llvm/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) |
