aboutsummaryrefslogtreecommitdiffstats
path: root/include/gtest
diff options
context:
space:
mode:
authorkosak <kosak@google.com>2015-02-14 02:26:43 +0000
committerkosak <kosak@google.com>2015-02-14 02:26:43 +0000
commit1d53731f2c210557caab5660dbe2c578dce6114f (patch)
treeb58c1d31650ed0cfaf1a0d6e1b57f15c5a23d796 /include/gtest
parent8209a45e2484a7eecc31a20a6dc6b8fd423d0b87 (diff)
downloadgoogletest-1d53731f2c210557caab5660dbe2c578dce6114f.tar.gz
googletest-1d53731f2c210557caab5660dbe2c578dce6114f.tar.bz2
googletest-1d53731f2c210557caab5660dbe2c578dce6114f.zip
Enable GTest thread safety on Native Client.
Diffstat (limited to 'include/gtest')
-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 d0d2b34d..98498309 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