diff options
| author | Edward O'Callaghan <eocallaghan@auroraux.org> | 2009-10-12 04:57:20 +0000 |
|---|---|---|
| committer | Edward O'Callaghan <eocallaghan@auroraux.org> | 2009-10-12 04:57:20 +0000 |
| commit | 8227b0512f75846bd03393e7d189611fd800d2a1 (patch) | |
| tree | 504e9e0b7247ab91c51b311e410c5a265be54f04 /llvm/utils/unittest/googletest/include/gtest | |
| parent | 0840c823e4b431e2405ec2fa12f619d37ae0f0f7 (diff) | |
| download | bcm5719-llvm-8227b0512f75846bd03393e7d189611fd800d2a1.tar.gz bcm5719-llvm-8227b0512f75846bd03393e7d189611fd800d2a1.zip | |
Haiku porting patches, Credit to Paul Davey.
llvm-svn: 83823
Diffstat (limited to 'llvm/utils/unittest/googletest/include/gtest')
| -rw-r--r-- | llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h | 4 |
1 files changed, 3 insertions, 1 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 6a1593ef017..3e49993bff4 100644 --- a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h +++ b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h @@ -185,6 +185,8 @@ #define GTEST_OS_ZOS #elif defined(__sun) && defined(__SVR4) #define GTEST_OS_SOLARIS +#elif defined(__HAIKU__) +#define GTEST_OS_HAIKU #endif // _MSC_VER // Determines whether ::std::string and ::string are available. @@ -225,7 +227,7 @@ // TODO(wan@google.com): uses autoconf to detect whether ::std::wstring // is available. -#if defined(GTEST_OS_CYGWIN) || defined(GTEST_OS_SOLARIS) +#if defined(GTEST_OS_CYGWIN) || defined(GTEST_OS_SOLARIS) || defined(GTEST_OS_HAIKU) // At least some versions of cygwin don't support ::std::wstring. // Solaris' libc++ doesn't support it either. #define GTEST_HAS_STD_WSTRING 0 |
