diff options
| author | shiqian <shiqian@861a406c-534a-0410-8894-cb66d6ee9925> | 2008-07-09 20:58:26 +0000 |
|---|---|---|
| committer | shiqian <shiqian@861a406c-534a-0410-8894-cb66d6ee9925> | 2008-07-09 20:58:26 +0000 |
| commit | e0ecb7ac588e4061fe57207ff3734e465637b14d (patch) | |
| tree | 81afa87cb21e28946ccd96f22fce35c4158c6d51 /include | |
| parent | e4e9a8bd7d2dbbad62030c8f80513e3c81b32213 (diff) | |
| download | googletest-e0ecb7ac588e4061fe57207ff3734e465637b14d.tar.gz googletest-e0ecb7ac588e4061fe57207ff3734e465637b14d.tar.bz2 googletest-e0ecb7ac588e4061fe57207ff3734e465637b14d.zip | |
Makes Google Test compile on Mac OS X and Cygwin, and adds project files for Microsoft Visual Studio.
Diffstat (limited to 'include')
| -rw-r--r-- | include/gtest/internal/gtest-port.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index 4ba6d552..90298d5d 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -66,6 +66,7 @@ // Test flag names share, in upper case. // // Macros indicating the current platform: +// GTEST_OS_CYGWIN - defined iff compiled on Cygwin. // GTEST_OS_LINUX - defined iff compiled on Linux. // GTEST_OS_MAC - defined iff compiled on Mac OS X. // GTEST_OS_WINDOWS - defined iff compiled on Windows. @@ -132,7 +133,9 @@ #define GTEST_FLAG_PREFIX_UPPER "GTEST_" // Determines the platform on which Google Test is compiled. -#ifdef _MSC_VER +#ifdef __CYGWIN__ +#define GTEST_OS_CYGWIN +#elif defined _MSC_VER // TODO(kenton@google.com): GTEST_OS_WINDOWS is currently used to mean // both "The OS is Windows" and "The compiler is MSVC". These // meanings really should be separated in order to better support |