Skip to content

G
googletest
Commit 067aa4c2 by Gregory Pakosz
Options

Do not define GTEST_IS_THREADSAFE within GTEST_HAS_SEH

parent 3fd66989
Showing with 7 additions and 3 deletions
googletest/include/gtest/internal/gtest-port.h
...@@ -785,12 +785,16 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION; ...@@ -785,12 +785,16 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
# define GTEST_HAS_SEH 0 # define GTEST_HAS_SEH 0
# endif # endif
#define GTEST_IS_THREADSAFE \ #endif // GTEST_HAS_SEH
(GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ \
#ifndef GTEST_IS_THREADSAFE
# define GTEST_IS_THREADSAFE \
( GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ \
|| (GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT) \ || (GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT) \
|| GTEST_HAS_PTHREAD) || GTEST_HAS_PTHREAD)
#endif // GTEST_HAS_SEH #endif // GTEST_IS_THREADSAFE
// GTEST_API_ qualifies all symbols that must be exported. The definitions below // GTEST_API_ qualifies all symbols that must be exported. The definitions below
// are guarded by #ifndef to give embedders a chance to define GTEST_API_ in // are guarded by #ifndef to give embedders a chance to define GTEST_API_ in
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment