diff options
| author | Copybara-Service <copybara-worker@google.com> | 2024-05-06 13:31:42 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2024-05-06 13:31:42 -0700 |
| commit | fa6de7f4382f5c8fb8b9e32eea28a2eb44966c32 (patch) | |
| tree | e2201575571959babf89eae0cf652a9e0ab2401f | |
| parent | 2d684efe87cafde18d8ce096887db48c83abb73c (diff) | |
| parent | 5035ef3473c72e61cde8f415b40eb23706633875 (diff) | |
| download | googletest-fa6de7f4382f5c8fb8b9e32eea28a2eb44966c32.zip googletest-fa6de7f4382f5c8fb8b9e32eea28a2eb44966c32.tar.gz googletest-fa6de7f4382f5c8fb8b9e32eea28a2eb44966c32.tar.bz2 | |
Merge pull request #4527 from abhina-sree:abhina/add_zos
PiperOrigin-RevId: 631167807
Change-Id: I563883341972bbb82c7407ebf3755d64317b84fc
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index cd64edf..8d27c2c 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -670,7 +670,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION; // Determines whether to support death tests. // pops up a dialog window that cannot be suppressed programmatically. #if (defined(GTEST_OS_LINUX) || defined(GTEST_OS_CYGWIN) || \ - defined(GTEST_OS_SOLARIS) || \ + defined(GTEST_OS_SOLARIS) || defined(GTEST_OS_ZOS) || \ (defined(GTEST_OS_MAC) && !defined(GTEST_OS_IOS)) || \ (defined(GTEST_OS_WINDOWS_DESKTOP) && _MSC_VER) || \ defined(GTEST_OS_WINDOWS_MINGW) || defined(GTEST_OS_AIX) || \ |