mirror of
https://github.com/google/googletest.git
synced 2024-12-27 02:01:25 +08:00
Merge pull request #4527 from abhina-sree:abhina/add_zos
PiperOrigin-RevId: 631167807 Change-Id: I563883341972bbb82c7407ebf3755d64317b84fc
This commit is contained in:
commit
fa6de7f438
@ -670,7 +670,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
|
|||||||
// Determines whether to support death tests.
|
// Determines whether to support death tests.
|
||||||
// pops up a dialog window that cannot be suppressed programmatically.
|
// pops up a dialog window that cannot be suppressed programmatically.
|
||||||
#if (defined(GTEST_OS_LINUX) || defined(GTEST_OS_CYGWIN) || \
|
#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_MAC) && !defined(GTEST_OS_IOS)) || \
|
||||||
(defined(GTEST_OS_WINDOWS_DESKTOP) && _MSC_VER) || \
|
(defined(GTEST_OS_WINDOWS_DESKTOP) && _MSC_VER) || \
|
||||||
defined(GTEST_OS_WINDOWS_MINGW) || defined(GTEST_OS_AIX) || \
|
defined(GTEST_OS_WINDOWS_MINGW) || defined(GTEST_OS_AIX) || \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user