diff options
| author | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2014-06-18 21:31:01 +0000 |
|---|---|---|
| committer | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2014-06-18 21:31:01 +0000 |
| commit | 0476e154db5fab1721c2a0f32abf4aa773679b52 (patch) | |
| tree | c859c3c901d101cc296188c7a4af67dcaa47b96c | |
| parent | 2f9c469cd2ac136ca4b496b8682a316ce6bf466d (diff) | |
| download | gtest-0476e154db5fab1721c2a0f32abf4aa773679b52.tar.gz | |
Additional changes, to add support for Windows Phone and Windows RT
git-svn-id: http://googletest.googlecode.com/svn/trunk@690 861a406c-534a-0410-8894-cb66d6ee9925
| -rw-r--r-- | include/gtest/internal/gtest-port.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index efb479d..f376dfa 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -917,7 +917,9 @@ using ::std::tuple_size; # endif #define GTEST_IS_THREADSAFE \ - (GTEST_OS_WINDOWS || GTEST_HAS_PTHREAD) + (0 \ + || (GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT) \ + || GTEST_HAS_PTHREAD) #endif // GTEST_HAS_SEH @@ -1465,7 +1467,7 @@ class Notification { GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification); }; -# elif GTEST_OS_WINDOWS +# elif GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT GTEST_API_ void SleepMilliseconds(int n); @@ -1600,7 +1602,7 @@ class ThreadWithParam : public ThreadWithParamBase { # endif // GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW # if 0 // OS detection -# elif GTEST_OS_WINDOWS +# elif GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT // Mutex implements mutex on Windows platforms. It is used in conjunction // with class MutexLock: |