diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-10-12 12:44:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-12 12:44:33 -0400 |
| commit | 754cb8ed9643cf8f2c82635ae43b1b9329f846da (patch) | |
| tree | fa6fa5c4d290b85f878824c04e53ad37ea4d3194 /googletest/include/gtest/internal/gtest-port-arch.h | |
| parent | 095b3113e7438fd0be901e20b40d376bcd8ef860 (diff) | |
| parent | 864b6c2d35db5c2c8ca4a4bad66e295a64f47011 (diff) | |
| download | googletest-754cb8ed9643cf8f2c82635ae43b1b9329f846da.tar.gz googletest-754cb8ed9643cf8f2c82635ae43b1b9329f846da.tar.bz2 googletest-754cb8ed9643cf8f2c82635ae43b1b9329f846da.zip | |
Merge branch 'master' into relocatable-pkgconfig-fix
Diffstat (limited to 'googletest/include/gtest/internal/gtest-port-arch.h')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port-arch.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/googletest/include/gtest/internal/gtest-port-arch.h b/googletest/include/gtest/internal/gtest-port-arch.h index 587ed5e5..4f2b87ba 100644 --- a/googletest/include/gtest/internal/gtest-port-arch.h +++ b/googletest/include/gtest/internal/gtest-port-arch.h @@ -66,6 +66,8 @@ # else # define GTEST_OS_WINDOWS_DESKTOP 1 # endif // _WIN32_WCE +#elif defined __OS2__ +# define GTEST_OS_OS2 1 #elif defined __APPLE__ # define GTEST_OS_MAC 1 # if TARGET_OS_IPHONE |