diff options
| author | Miodrag Milanovic <mmicko@gmail.com> | 2018-06-12 08:06:27 +0200 |
|---|---|---|
| committer | Miodrag Milanovic <mmicko@gmail.com> | 2018-06-12 08:06:27 +0200 |
| commit | 5a5dcc52fd1a20e4065a8312001c695d72c604ad (patch) | |
| tree | c80494aeac819acbfc6b28bee7f2a81c0299f58b /3rdparty | |
| parent | 102e10f2ddfb3409dfc8dc54200a382320dc3a2e (diff) | |
| download | nextpnr-5a5dcc52fd1a20e4065a8312001c695d72c604ad.tar.gz nextpnr-5a5dcc52fd1a20e4065a8312001c695d72c604ad.tar.bz2 nextpnr-5a5dcc52fd1a20e4065a8312001c695d72c604ad.zip | |
Made gtest work on MINGW with solution from https://github.com/google/googletest/issues/606
Diffstat (limited to '3rdparty')
| -rw-r--r-- | 3rdparty/googletest/googletest/include/gtest/internal/gtest-port.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/3rdparty/googletest/googletest/include/gtest/internal/gtest-port.h b/3rdparty/googletest/googletest/include/gtest/internal/gtest-port.h index 0094ed50..411f1323 100644 --- a/3rdparty/googletest/googletest/include/gtest/internal/gtest-port.h +++ b/3rdparty/googletest/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 { |