diff options
| author | Tanzinul Islam <t_17_7@hotmail.com> | 2018-05-13 10:42:21 (GMT) |
|---|---|---|
| committer | Tanzinul Islam <t_17_7@hotmail.com> | 2018-05-13 10:42:21 (GMT) |
| commit | 3280099951c51b7d2745bd840f2dd9d967cffcda (patch) | |
| tree | 3f76ba85031bac42ebc77f99c49d48ae480964bb /googletest/include/gtest/internal/gtest-port.h | |
| parent | 10f05a627c2da8d7de78da1b08f984ce8de398fb (diff) | |
| parent | 08d5b1f33af8c18785fb8ca02792b5fac81e248f (diff) | |
| download | googletest-3280099951c51b7d2745bd840f2dd9d967cffcda.zip googletest-3280099951c51b7d2745bd840f2dd9d967cffcda.tar.gz googletest-3280099951c51b7d2745bd840f2dd9d967cffcda.tar.bz2 | |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
Diffstat (limited to 'googletest/include/gtest/internal/gtest-port.h')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 3 |
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 e677cd9..fafb134 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -813,7 +813,8 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION; (GTEST_OS_MAC && !GTEST_OS_IOS) || \ (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \ GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \ - GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD || GTEST_OS_NETBSD) + GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD || \ + GTEST_OS_NETBSD || GTEST_OS_FUCHSIA) # define GTEST_HAS_DEATH_TEST 1 #endif |