summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925>2015-02-14 02:26:43 +0000
committerkosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925>2015-02-14 02:26:43 +0000
commit3be1ef9f1c6139654a7784c53aa833c7a37a3148 (patch)
treeb58c1d31650ed0cfaf1a0d6e1b57f15c5a23d796
parentd4984975ee0bdd68aeb9dfbc00258cce534b5a9b (diff)
downloadgoogletest-3be1ef9f1c6139654a7784c53aa833c7a37a3148.tar.gz
Enable GTest thread safety on Native Client.
git-svn-id: http://googletest.googlecode.com/svn/trunk@707 861a406c-534a-0410-8894-cb66d6ee9925
-rw-r--r--include/gtest/internal/gtest-port.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h
index d0d2b34..9849830 100644
--- a/include/gtest/internal/gtest-port.h
+++ b/include/gtest/internal/gtest-port.h
@@ -635,13 +635,13 @@ struct _RTL_CRITICAL_SECTION;
// Determines whether Google Test can use the pthreads library.
#ifndef GTEST_HAS_PTHREAD
-// The user didn't tell us explicitly, so we assume pthreads support is
-// available on Linux and Mac.
+// The user didn't tell us explicitly, so we make reasonable assumptions about
+// which platforms have pthreads support.
//
// To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0
// to your compiler flags.
# define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX \
- || GTEST_OS_QNX || GTEST_OS_FREEBSD)
+ || GTEST_OS_QNX || GTEST_OS_FREEBSD || GTEST_OS_NACL)
#endif // GTEST_HAS_PTHREAD
#if GTEST_HAS_PTHREAD