From 5502540a5b5c5378824cd46591c2366bcf027555 Mon Sep 17 00:00:00 2001 From: chandlerc Date: Mon, 10 Aug 2009 20:59:41 +0000 Subject: Unbreak the build for Solaris by selecting the correct include headers for its POSIX regex support. Patch contributed by Monty Taylor to the protocol buffer project, and relayed by Kenton to GoogleTest. Tweaked to include the new define in the #endif comment. --- include/gtest/internal/gtest-port.h | 6 ++++-- 1 file 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, 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. -- cgit v1.2.3