diff options
| author | Nick Lewycky <nicholas@mxc.ca> | 2010-06-23 06:48:34 +0000 |
|---|---|---|
| committer | Nick Lewycky <nicholas@mxc.ca> | 2010-06-23 06:48:34 +0000 |
| commit | 99d71d1e7a555c5db99ab90f129e935791fbce81 (patch) | |
| tree | b7efdb6a7c59a28782dee0a675cc6750a8760435 /llvm/utils/unittest/googletest/include/gtest/internal | |
| parent | 37141f4fb4ac93cee02ead6bae49539086d2629f (diff) | |
| download | bcm5719-llvm-99d71d1e7a555c5db99ab90f129e935791fbce81.tar.gz bcm5719-llvm-99d71d1e7a555c5db99ab90f129e935791fbce81.zip | |
Don't link against libm and libpthread which don't exist in BeOS/Haiku. Also,
Haiku like Linux provides <regex.h>, so use it. Patch by Paul Davey!
llvm-svn: 106620
Diffstat (limited to 'llvm/utils/unittest/googletest/include/gtest/internal')
| -rw-r--r-- | llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h index cc5637d2fea..9683271e48f 100644 --- a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h +++ b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h @@ -80,6 +80,7 @@ // the given platform; otherwise undefined): // GTEST_OS_AIX - IBM AIX // GTEST_OS_CYGWIN - Cygwin +// GTEST_OS_HAIKU - Haiku // GTEST_OS_LINUX - Linux // GTEST_OS_MAC - Mac OS X // GTEST_OS_SOLARIS - Sun Solaris @@ -220,11 +221,11 @@ #elif defined(_AIX) #define GTEST_OS_AIX 1 #elif defined(__HAIKU__) -#define GTEST_OS_HAIKU +#define GTEST_OS_HAIKU 1 #endif // __CYGWIN__ -#if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_SYMBIAN || \ - GTEST_OS_SOLARIS || GTEST_OS_AIX +#if GTEST_OS_CYGWIN || GTEST_OS_HAIKU || GTEST_OS_LINUX || GTEST_OS_MAC || \ + GTEST_OS_SYMBIAN || GTEST_OS_SOLARIS || GTEST_OS_AIX // On some platforms, <regex.h> needs someone to define size_t, and // won't compile otherwise. We can #include it here as we already |
