gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds Google Native Client compatibility (issue 329).

Browse Source
This commit is contained in:
vladlosev 2010-11-30 22:10:12 +00:00
parent e349025485
commit 42bf979ce7
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,6 +88,7 @@
// GTEST_OS_CYGWIN - Cygwin // GTEST_OS_CYGWIN - Cygwin
// GTEST_OS_LINUX - Linux // GTEST_OS_LINUX - Linux
// GTEST_OS_MAC - Mac OS X // GTEST_OS_MAC - Mac OS X
// GTEST_OS_NACL - Google Native Client (NaCl)
// GTEST_OS_SOLARIS - Sun Solaris // GTEST_OS_SOLARIS - Sun Solaris
// GTEST_OS_SYMBIAN - Symbian // GTEST_OS_SYMBIAN - Symbian
// GTEST_OS_WINDOWS - Windows (Desktop, MinGW, or Mobile) // GTEST_OS_WINDOWS - Windows (Desktop, MinGW, or Mobile)
@ -230,6 +231,8 @@
#define GTEST_OS_SOLARIS 1 #define GTEST_OS_SOLARIS 1
#elif defined(_AIX) #elif defined(_AIX)
#define GTEST_OS_AIX 1 #define GTEST_OS_AIX 1
#elif defined __native_client__
#define GTEST_OS_NACL 1
#endif // __CYGWIN__ #endif // __CYGWIN__
// Brings in definitions for functions used in the testing::internal::posix // 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 // is not the case, we need to include headers that provide the functions
// mentioned above. // mentioned above.
#include <unistd.h> #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 #elif !GTEST_OS_WINDOWS_MOBILE
#include <direct.h> #include <direct.h>
#include <io.h> #include <io.h>

4
src/gtest-filepath.cc
View File

@ -39,8 +39,8 @@
#elif GTEST_OS_WINDOWS #elif GTEST_OS_WINDOWS
#include <direct.h> #include <direct.h>
#include <io.h> #include <io.h>
#elif GTEST_OS_SYMBIAN #elif GTEST_OS_SYMBIAN || GTEST_OS_NACL
// Symbian OpenC has PATH_MAX in sys/syslimits.h // Symbian OpenC and NaCl have PATH_MAX in sys/syslimits.h
#include <sys/syslimits.h> #include <sys/syslimits.h>
#else #else
#include <limits.h> #include <limits.h>