aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCopybara-Service <copybara-worker@google.com>2024-05-03 08:51:23 -0700
committerCopybara-Service <copybara-worker@google.com>2024-05-03 08:51:23 -0700
commit2d16ed055d09c3689d44b272adc097393de948a0 (patch)
tree217a650778faffecc12b0b47641c4b4b0aafc285
parent2954cb8d879886403d55343f941ae7d0216e0f6b (diff)
parentfbc93e61c484419bf02cea2b3e5641db592f8dcf (diff)
downloadgoogletest-2d16ed055d09c3689d44b272adc097393de948a0.tar.gz
Merge pull request #3991 from pgroke-dt:default-enable-thread-support-for-Solaris-AIX-zOS
PiperOrigin-RevId: 630402377 Change-Id: Ie9cafffaa49c2c02220981d665daa672164d35d8
-rw-r--r--googletest/include/gtest/internal/gtest-port.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h
index 4f0d89d0..cd64edf4 100644
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@@ -607,7 +607,8 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
defined(GTEST_OS_NETBSD) || defined(GTEST_OS_FUCHSIA) || \
defined(GTEST_OS_DRAGONFLY) || defined(GTEST_OS_GNU_KFREEBSD) || \
defined(GTEST_OS_OPENBSD) || defined(GTEST_OS_HAIKU) || \
- defined(GTEST_OS_GNU_HURD))
+ defined(GTEST_OS_GNU_HURD) || defined(GTEST_OS_SOLARIS) || \
+ defined(GTEST_OS_AIX) || defined(GTEST_OS_ZOS))
#define GTEST_HAS_PTHREAD 1
#else
#define GTEST_HAS_PTHREAD 0