forked from bincrafters/conan-gtest
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Applying patch for MINGW thread issue prescribed at google/googletest…
…#606 (comment) and discussed in bincrafters/community#166
- Loading branch information
Matthew Russell
committed
Mar 28, 2018
1 parent
bb0f36e
commit 5200d60
Showing
2 changed files
with
42 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h | ||
index 0094ed5..411f132 100644 | ||
--- a/googletest/include/gtest/internal/gtest-port.h | ||
+++ b/googletest/include/gtest/internal/gtest-port.h | ||
@@ -604,7 +604,7 @@ struct _RTL_CRITICAL_SECTION; | ||
|| GTEST_OS_QNX || GTEST_OS_FREEBSD || GTEST_OS_NACL) | ||
#endif // GTEST_HAS_PTHREAD | ||
|
||
-#if GTEST_HAS_PTHREAD | ||
+#if GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW | ||
// gtest-port.h guarantees to #include <pthread.h> when GTEST_HAS_PTHREAD is | ||
// true. | ||
# include <pthread.h> // NOLINT | ||
@@ -1441,7 +1441,7 @@ void SetInjectableArgvs(const ::std::vector<testing::internal::string>* | ||
|
||
// Defines synchronization primitives. | ||
#if GTEST_IS_THREADSAFE | ||
-# if GTEST_HAS_PTHREAD | ||
+# if GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW | ||
// Sleeps for (roughly) n milliseconds. This function is only for testing | ||
// Google Test's own constructs. Don't use it in user tests, either | ||
// directly or indirectly. | ||
@@ -1458,7 +1458,7 @@ inline void SleepMilliseconds(int n) { | ||
// Notification has already been imported into the namespace. | ||
// Nothing to do here. | ||
|
||
-# elif GTEST_HAS_PTHREAD | ||
+# elif GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW | ||
// Allows a controller thread to pause execution of newly created | ||
// threads until notified. Instances of this class must be created | ||
// and destroyed in the controller thread. | ||
@@ -1918,7 +1918,7 @@ class ThreadLocal : public ThreadLocalBase { | ||
GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal); | ||
}; | ||
|
||
-# elif GTEST_HAS_PTHREAD | ||
+# elif GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW | ||
|
||
// MutexBase and Mutex implement mutex on pthreads-based platforms. | ||
class MutexBase { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters