diff options
| author | Claus Stovgaard <claus.stovgaard@gmail.com> | 2017-08-31 12:22:53 +0200 |
|---|---|---|
| committer | Claus Stovgaard <claus.stovgaard@gmail.com> | 2017-08-31 12:22:53 +0200 |
| commit | 34355c0e870efce3015fa19aff88c7d79839bbb1 (patch) | |
| tree | 0fa858569364bb5818793d97d264aefd365399b5 /googletest/include/gtest/internal/gtest-port-arch.h | |
| parent | a6418a4dd19ea0e8aa5f7706b8bff12a2e453821 (diff) | |
| parent | 16bfba08e2c63c33834a98d092cd6f1a3e547289 (diff) | |
| download | googletest-34355c0e870efce3015fa19aff88c7d79839bbb1.tar.gz googletest-34355c0e870efce3015fa19aff88c7d79839bbb1.tar.bz2 googletest-34355c0e870efce3015fa19aff88c7d79839bbb1.zip | |
Merge remote-tracking branch 'github_google/master' into master-github_frosteyes
# Conflicts:
# .gitignore
Diffstat (limited to 'googletest/include/gtest/internal/gtest-port-arch.h')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port-arch.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/googletest/include/gtest/internal/gtest-port-arch.h b/googletest/include/gtest/internal/gtest-port-arch.h index 74ab9490..bb206167 100644 --- a/googletest/include/gtest/internal/gtest-port-arch.h +++ b/googletest/include/gtest/internal/gtest-port-arch.h @@ -69,6 +69,8 @@ # endif #elif defined __FreeBSD__ # define GTEST_OS_FREEBSD 1 +#elif defined __Fuchsia__ +# define GTEST_OS_FUCHSIA 1 #elif defined __linux__ # define GTEST_OS_LINUX 1 # if defined __ANDROID__ @@ -84,6 +86,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__ |