diff options
| author | chandlerc <chandlerc@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-08-10 20:59:41 +0000 |
|---|---|---|
| committer | chandlerc <chandlerc@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-08-10 20:59:41 +0000 |
| commit | 5502540a5b5c5378824cd46591c2366bcf027555 (patch) | |
| tree | 1fc7c99d8daa11c0afb8842a571fde98c0f3937a /include/gtest/internal | |
| parent | ed8500b341c473ecf46acd13951ae5b4e3acc780 (diff) | |
| download | googletest-5502540a5b5c5378824cd46591c2366bcf027555.tar.gz googletest-5502540a5b5c5378824cd46591c2366bcf027555.tar.bz2 googletest-5502540a5b5c5378824cd46591c2366bcf027555.zip | |
Unbreak the build for Solaris by selecting the correct include headers for its
POSIX regex support. Patch contributed by Monty Taylor <monty.taylor@gmail.com>
to the protocol buffer project, and relayed by Kenton to GoogleTest. Tweaked to
include the new define in the #endif comment.
Diffstat (limited to 'include/gtest/internal')
| -rw-r--r-- | include/gtest/internal/gtest-port.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index 58b2eaf8..a5adbc06 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -194,7 +194,8 @@ #define GTEST_OS_SOLARIS 1 #endif // __CYGWIN__ -#if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_SYMBIAN +#if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_SYMBIAN || \ + GTEST_OS_SOLARIS // On some platforms, <regex.h> needs someone to define size_t, and // won't compile otherwise. We can #include it here as we already @@ -224,7 +225,8 @@ // simple regex implementation instead. #define GTEST_USES_SIMPLE_RE 1 -#endif // GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC +#endif // GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC || + // GTEST_OS_SYMBIAN || GTEST_OS_SOLARIS // Defines GTEST_HAS_EXCEPTIONS to 1 if exceptions are enabled, or 0 // otherwise. |