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 | df40664a63a91a1ab4b40c7f2d356cf255071d56 (patch) | |
| tree | f7451e40d2fd2896f2f742d8a3f5dc6e375da6d3 /utils/unittest | |
| parent | f5e16139f28d650536024280a16dcf73513baf46 (diff) | |
| download | llvm-df40664a63a91a1ab4b40c7f2d356cf255071d56.tar.gz llvm-df40664a63a91a1ab4b40c7f2d356cf255071d56.tar.bz2 llvm-df40664a63a91a1ab4b40c7f2d356cf255071d56.tar.xz | |
Haiku porting patches, Credit to Paul Davey.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@83823 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/unittest')
| -rw-r--r-- | utils/unittest/googletest/include/gtest/internal/gtest-port.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/utils/unittest/googletest/include/gtest/internal/gtest-port.h b/utils/unittest/googletest/include/gtest/internal/gtest-port.h index 6a1593ef01..3e49993bff 100644 --- a/utils/unittest/googletest/include/gtest/internal/gtest-port.h +++ b/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 |