diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-03-31 16:27:55 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-03-31 16:27:55 +0000 |
| commit | 6a26383e31cf79dd0acf89bf3a53c7a805decf1d (patch) | |
| tree | 95a4ccf0c315fb0f8020f3e06c871f97eb44ddd9 /include | |
| parent | 3e54f5a3715f2c0b4425e55cc5d42dd42f4eda54 (diff) | |
| download | googletest-6a26383e31cf79dd0acf89bf3a53c7a805decf1d.tar.gz googletest-6a26383e31cf79dd0acf89bf3a53c7a805decf1d.tar.bz2 googletest-6a26383e31cf79dd0acf89bf3a53c7a805decf1d.zip | |
Cleans up the use of GTEST_OS_WINDOWS and _MSC_VER.
Diffstat (limited to 'include')
| -rw-r--r-- | include/gtest/gtest.h | 9 | ||||
| -rw-r--r-- | include/gtest/internal/gtest-port.h | 8 |
2 files changed, 3 insertions, 14 deletions
diff --git a/include/gtest/gtest.h b/include/gtest/gtest.h index 9b72b636..6d87e035 100644 --- a/include/gtest/gtest.h +++ b/include/gtest/gtest.h @@ -51,15 +51,8 @@ #ifndef GTEST_INCLUDE_GTEST_GTEST_H_ #define GTEST_INCLUDE_GTEST_GTEST_H_ -// The following platform macros are used throughout Google Test: +// The following platform macro is used throughout Google Test: // _WIN32_WCE Windows CE (set in project files) -// -// Note that even though _MSC_VER and _WIN32_WCE really indicate a compiler -// and a Win32 implementation, respectively, we use them to indicate the -// combination of compiler - Win 32 API - C library, since the code currently -// only supports: -// Windows proper with Visual C++ and MS C library (_MSC_VER && !_WIN32_WCE) and -// Windows Mobile with Visual C++ and no C library (_WIN32_WCE). #include <limits> #include <gtest/internal/gtest-internal.h> diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index a304b0ae..054851bc 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -172,11 +172,7 @@ #define GTEST_OS_CYGWIN 1 #elif __SYMBIAN32__ #define GTEST_OS_SYMBIAN 1 -#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 -// Windows compilers other than MSVC. +#elif defined _WIN32 #define GTEST_OS_WINDOWS 1 #elif defined __APPLE__ #define GTEST_OS_MAC 1 @@ -186,7 +182,7 @@ #define GTEST_OS_ZOS 1 #elif defined(__sun) && defined(__SVR4) #define GTEST_OS_SOLARIS 1 -#endif // _MSC_VER +#endif // __CYGWIN__ #if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC |