Skip to content

Commit 77d556c

Browse files
committed
according to dvdjg it should work
1 parent 42b4eaa commit 77d556c

File tree

1 file changed

+4
-4
lines changed
  • tests/lib/gtest-1.8.0/googletest/include/gtest/internal

1 file changed

+4
-4
lines changed

tests/lib/gtest-1.8.0/googletest/include/gtest/internal/gtest-port.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ struct _RTL_CRITICAL_SECTION;
604604
|| GTEST_OS_QNX || GTEST_OS_FREEBSD || GTEST_OS_NACL)
605605
#endif // GTEST_HAS_PTHREAD
606606

607-
#if GTEST_HAS_PTHREAD
607+
#if GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW
608608
// gtest-port.h guarantees to #include <pthread.h> when GTEST_HAS_PTHREAD is
609609
// true.
610610
# include <pthread.h> // NOLINT
@@ -1441,7 +1441,7 @@ void SetInjectableArgvs(const ::std::vector<testing::internal::string>*
14411441

14421442
// Defines synchronization primitives.
14431443
#if GTEST_IS_THREADSAFE
1444-
# if GTEST_HAS_PTHREAD
1444+
#if GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW
14451445
// Sleeps for (roughly) n milliseconds. This function is only for testing
14461446
// Google Test's own constructs. Don't use it in user tests, either
14471447
// directly or indirectly.
@@ -1458,7 +1458,7 @@ inline void SleepMilliseconds(int n) {
14581458
// Notification has already been imported into the namespace.
14591459
// Nothing to do here.
14601460

1461-
# elif GTEST_HAS_PTHREAD
1461+
# elif GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW
14621462
// Allows a controller thread to pause execution of newly created
14631463
// threads until notified. Instances of this class must be created
14641464
// and destroyed in the controller thread.
@@ -1918,7 +1918,7 @@ class ThreadLocal : public ThreadLocalBase {
19181918
GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal);
19191919
};
19201920

1921-
# elif GTEST_HAS_PTHREAD
1921+
# elif GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW
19221922

19231923
// MutexBase and Mutex implement mutex on pthreads-based platforms.
19241924
class MutexBase {

0 commit comments

Comments
 (0)