diff options
| author | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2017-06-23 19:35:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-23 19:35:25 -0400 |
| commit | 4bab34d2084259cba67f3bfb51217c10d606e175 (patch) | |
| tree | 54dab96e78874ec97c7753de1085321e0e42f9c9 | |
| parent | f050aff0c20229122f29974fda00dfd0e5fc99b7 (diff) | |
| parent | fac0dfbe738e4c6973e2137c776560459f142dce (diff) | |
| download | googletest-4bab34d2084259cba67f3bfb51217c10d606e175.tar.gz googletest-4bab34d2084259cba67f3bfb51217c10d606e175.tar.bz2 googletest-4bab34d2084259cba67f3bfb51217c10d606e175.zip | |
Merge pull request #1081 from krytarowski/netbsd-1
Add NetBSD support
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port-arch.h | 2 | ||||
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/googletest/include/gtest/internal/gtest-port-arch.h b/googletest/include/gtest/internal/gtest-port-arch.h index 74ab9490..f32fc06b 100644 --- a/googletest/include/gtest/internal/gtest-port-arch.h +++ b/googletest/include/gtest/internal/gtest-port-arch.h @@ -84,6 +84,8 @@ # define GTEST_OS_HPUX 1 #elif defined __native_client__ # define GTEST_OS_NACL 1 +#elif defined __NetBSD__ +# define GTEST_OS_NETBSD 1 #elif defined __OpenBSD__ # define GTEST_OS_OPENBSD 1 #elif defined __QNX__ diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 5e4f8ba8..f6cd3c03 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -128,6 +128,7 @@ // GTEST_OS_MAC - Mac OS X // GTEST_OS_IOS - iOS // GTEST_OS_NACL - Google Native Client (NaCl) +// GTEST_OS_NETBSD - NetBSD // GTEST_OS_OPENBSD - OpenBSD // GTEST_OS_QNX - QNX // GTEST_OS_SOLARIS - Sun Solaris @@ -607,7 +608,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION; // 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_NACL) + || GTEST_OS_QNX || GTEST_OS_FREEBSD || GTEST_OS_NACL || GTEST_OS_NETBSD) #endif // GTEST_HAS_PTHREAD #if GTEST_HAS_PTHREAD @@ -800,7 +801,7 @@ using ::std::tuple_size; (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_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD || GTEST_OS_NETBSD) # define GTEST_HAS_DEATH_TEST 1 #endif |