generic-library/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Unbreak the build for Solaris by selecting the correct include headers for its

Browse Source 
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.
This commit is contained in:
chandlerc 2009-08-10 20:59:41 +00:00
parent ed8500b341
commit 5502540a5b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/gtest/internal/gtest-port.h
View File

@ -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.