Lines 1-19
Link Here
|
1 |
--- include/gtest/internal/gtest-port.h.orig 2010-04-16 06:02:02.000000000 +0800 |
1 |
--- include/gtest/internal/gtest-port.h.orig 2014-08-16 09:30:13.114359210 +0100 |
2 |
+++ include/gtest/internal/gtest-port.h 2013-10-16 23:39:02.000000000 +0800 |
2 |
+++ include/gtest/internal/gtest-port.h 2014-08-16 09:32:56.496223003 +0100 |
3 |
@@ -173,6 +173,7 @@ |
3 |
@@ -92,6 +92,7 @@ |
4 |
#include <stdlib.h> |
4 |
// the given platform; otherwise undefined): |
5 |
#include <stdio.h> |
5 |
// GTEST_OS_AIX - IBM AIX |
6 |
#include <string.h> |
6 |
// GTEST_OS_CYGWIN - Cygwin |
7 |
+#include <unistd.h> |
7 |
+// GTEST_OS_FREEBSD - FreeBSD |
8 |
#ifndef _WIN32_WCE |
8 |
// GTEST_OS_HPUX - HP-UX |
9 |
#include <sys/stat.h> |
9 |
// GTEST_OS_LINUX - Linux |
10 |
#endif // !_WIN32_WCE |
10 |
// GTEST_OS_LINUX_ANDROID - Google Android |
11 |
@@ -399,7 +400,7 @@ |
11 |
@@ -248,6 +249,8 @@ |
12 |
// defining __GNUC__ and friends, but cannot compile GCC's tuple |
12 |
# define GTEST_OS_IOS_SIMULATOR 1 |
13 |
// implementation. MSVC 2008 (9.0) provides TR1 tuple in a 323 MB |
13 |
# endif |
14 |
// Feature Pack download, which we cannot assume the user has. |
14 |
# endif |
15 |
-#if (defined(__GNUC__) && !defined(__CUDACC__) && (GTEST_GCC_VER_ >= 40000)) \ |
15 |
+#elif defined __FreeBSD__ |
16 |
+#if (defined(__GNUC__) && !defined(__CUDACC__) && !defined(_LIBCPP_VERSION) && (GTEST_GCC_VER_ >= 40000)) \ |
16 |
+# define GTEST_OS_FREEBSD 1 |
17 |
|| _MSC_VER >= 1600 |
17 |
#elif defined __linux__ |
18 |
#define GTEST_USE_OWN_TR1_TUPLE 0 |
18 |
# define GTEST_OS_LINUX 1 |
19 |
#else |
19 |
# if defined __ANDROID__ |
|
|
20 |
@@ -646,7 +649,7 @@ |
21 |
(GTEST_OS_MAC && !GTEST_OS_IOS) || GTEST_OS_IOS_SIMULATOR || \ |
22 |
(GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \ |
23 |
GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \ |
24 |
- GTEST_OS_OPENBSD || GTEST_OS_QNX) |
25 |
+ GTEST_OS_FREEBSD || GTEST_OS_OPENBSD || GTEST_OS_QNX) |
26 |
# define GTEST_HAS_DEATH_TEST 1 |
27 |
# include <vector> // NOLINT |
28 |
#endif |