Skip to content

G
googletest
Commit 5502540a by chandlerc
Options

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.
parent ed8500b3
Showing with 4 additions and 2 deletions
include/gtest/internal/gtest-port.h
...@@ -194,7 +194,8 @@ ...@@ -194,7 +194,8 @@
#define GTEST_OS_SOLARIS 1 #define GTEST_OS_SOLARIS 1
#endif // __CYGWIN__ #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 // On some platforms, <regex.h> needs someone to define size_t, and
// won't compile otherwise. We can #include it here as we already // won't compile otherwise. We can #include it here as we already
...@@ -224,7 +225,8 @@ ...@@ -224,7 +225,8 @@
// simple regex implementation instead. // simple regex implementation instead.
#define GTEST_USES_SIMPLE_RE 1 #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 // Defines GTEST_HAS_EXCEPTIONS to 1 if exceptions are enabled, or 0
// otherwise. // otherwise.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment