diff options
| author | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-11-30 22:10:12 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-11-30 22:10:12 +0000 |
| commit | 7707f53780847ec97b17df3e3ade2a4efc1516b1 (patch) | |
| tree | 0674e71dda39d8d79d65049d7c0ff0f2fd89d9be | |
| parent | 1d59a3dde28ecccf49bc7b47285f8a7a39b0e5ba (diff) | |
| download | googletest-7707f53780847ec97b17df3e3ade2a4efc1516b1.tar.gz | |
Adds Google Native Client compatibility (issue 329).
git-svn-id: http://googletest.googlecode.com/svn/trunk@524 861a406c-534a-0410-8894-cb66d6ee9925
| -rw-r--r-- | include/gtest/internal/gtest-port.h | 10 | ||||
| -rw-r--r-- | src/gtest-filepath.cc | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index a9c7cae..f08f6df 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -88,6 +88,7 @@ // GTEST_OS_CYGWIN - Cygwin // GTEST_OS_LINUX - Linux // GTEST_OS_MAC - Mac OS X +// GTEST_OS_NACL - Google Native Client (NaCl) // GTEST_OS_SOLARIS - Sun Solaris // GTEST_OS_SYMBIAN - Symbian // GTEST_OS_WINDOWS - Windows (Desktop, MinGW, or Mobile) @@ -230,6 +231,8 @@ #define GTEST_OS_SOLARIS 1 #elif defined(_AIX) #define GTEST_OS_AIX 1 +#elif defined __native_client__ +#define GTEST_OS_NACL 1 #endif // __CYGWIN__ // Brings in definitions for functions used in the testing::internal::posix @@ -240,7 +243,12 @@ // is not the case, we need to include headers that provide the functions // mentioned above. #include <unistd.h> -#include <strings.h> +#if !GTEST_OS_NACL +// TODO(vladl@google.com): Remove this condition when Native Client SDK adds +// strings.h (tracked in +// http://code.google.com/p/nativeclient/issues/detail?id=1175). +#include <strings.h> // Native Client doesn't provide strings.h. +#endif #elif !GTEST_OS_WINDOWS_MOBILE #include <direct.h> #include <io.h> diff --git a/src/gtest-filepath.cc b/src/gtest-filepath.cc index 96557f3..118848a 100644 --- a/src/gtest-filepath.cc +++ b/src/gtest-filepath.cc @@ -39,8 +39,8 @@ #elif GTEST_OS_WINDOWS #include <direct.h> #include <io.h> -#elif GTEST_OS_SYMBIAN -// Symbian OpenC has PATH_MAX in sys/syslimits.h +#elif GTEST_OS_SYMBIAN || GTEST_OS_NACL +// Symbian OpenC and NaCl have PATH_MAX in sys/syslimits.h #include <sys/syslimits.h> #else #include <limits.h> |