3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-03-10 09:16:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not define GTEST_IS_THREADSAFE within GTEST_HAS_SEH

Browse Source
This commit is contained in:
Gregory Pakosz 2018-12-04 14:47:24 +01:00
parent 3fd66989bb
commit 067aa4c28b
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
googletest/include/gtest/internal/gtest-port.h
View File

@ -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