Lines 1-8
Link Here
|
1 |
o Add DragonFly and GNU/kFreeBSD support |
1 |
o Add DragonFly and GNU/kFreeBSD support |
2 |
o Implement GetThreadCount() for BSDs |
2 |
o Implement GetThreadCount() for BSDs |
3 |
|
3 |
|
4 |
--- include/gtest/internal/gtest-port-arch.h.orig 2017-09-23 23:21:02 UTC |
4 |
--- googletest/include/gtest/internal/gtest-port-arch.h.orig 2017-09-23 23:21:02 UTC |
5 |
+++ include/gtest/internal/gtest-port-arch.h |
5 |
+++ googletest/include/gtest/internal/gtest-port-arch.h |
6 |
@@ -67,6 +67,10 @@ |
6 |
@@ -67,6 +67,10 @@ |
7 |
# if TARGET_OS_IPHONE |
7 |
# if TARGET_OS_IPHONE |
8 |
# define GTEST_OS_IOS 1 |
8 |
# define GTEST_OS_IOS 1 |
Lines 14-21
Link Here
|
14 |
#elif defined __FreeBSD__ |
14 |
#elif defined __FreeBSD__ |
15 |
# define GTEST_OS_FREEBSD 1 |
15 |
# define GTEST_OS_FREEBSD 1 |
16 |
#elif defined __Fuchsia__ |
16 |
#elif defined __Fuchsia__ |
17 |
--- include/gtest/internal/gtest-port.h.orig 2018-08-31 15:21:57 UTC |
17 |
--- googletest/include/gtest/internal/gtest-port.h.orig 2018-08-31 15:21:57 UTC |
18 |
+++ include/gtest/internal/gtest-port.h |
18 |
+++ googletest/include/gtest/internal/gtest-port.h |
19 |
@@ -125,7 +125,9 @@ |
19 |
@@ -125,7 +125,9 @@ |
20 |
// |
20 |
// |
21 |
// GTEST_OS_AIX - IBM AIX |
21 |
// GTEST_OS_AIX - IBM AIX |
Lines 54-61
Link Here
|
54 |
# define GTEST_CAN_STREAM_RESULTS_ 1 |
54 |
# define GTEST_CAN_STREAM_RESULTS_ 1 |
55 |
#endif |
55 |
#endif |
56 |
|
56 |
|
57 |
--- src/gtest-port.cc.orig 2017-09-23 23:21:02 UTC |
57 |
--- googletest/src/gtest-port.cc.orig 2017-09-23 23:21:02 UTC |
58 |
+++ src/gtest-port.cc |
58 |
+++ googletest/src/gtest-port.cc |
59 |
@@ -52,6 +52,14 @@ |
59 |
@@ -52,6 +52,14 @@ |
60 |
# include <mach/vm_map.h> |
60 |
# include <mach/vm_map.h> |
61 |
#endif // GTEST_OS_MAC |
61 |
#endif // GTEST_OS_MAC |
Lines 152-159
Link Here
|
152 |
#elif GTEST_OS_QNX |
152 |
#elif GTEST_OS_QNX |
153 |
|
153 |
|
154 |
// Returns the number of threads running in the process, or 0 to indicate that |
154 |
// Returns the number of threads running in the process, or 0 to indicate that |
155 |
--- src/gtest.cc.orig 2017-09-23 23:21:02 UTC |
155 |
--- googletest/src/gtest.cc.orig 2017-09-23 23:21:02 UTC |
156 |
+++ src/gtest.cc |
156 |
+++ googletest/src/gtest.cc |
157 |
@@ -127,7 +127,7 @@ |
157 |
@@ -127,7 +127,7 @@ |
158 |
#endif |
158 |
#endif |
159 |
|
159 |
|
Lines 163-170
Link Here
|
163 |
# include <netdb.h> // NOLINT |
163 |
# include <netdb.h> // NOLINT |
164 |
# include <sys/socket.h> // NOLINT |
164 |
# include <sys/socket.h> // NOLINT |
165 |
# include <sys/types.h> // NOLINT |
165 |
# include <sys/types.h> // NOLINT |
166 |
--- test/googletest-port-test.cc.orig 2018-08-31 15:21:57 UTC |
166 |
--- googletest/test/googletest-port-test.cc.orig 2018-08-31 15:21:57 UTC |
167 |
+++ test/googletest-port-test.cc |
167 |
+++ googletest/test/googletest-port-test.cc |
168 |
@@ -293,7 +293,9 @@ TEST(FormatCompilerIndependentFileLocationTest, Format |
168 |
@@ -293,7 +293,9 @@ TEST(FormatCompilerIndependentFileLocationTest, Format |
169 |
EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(NULL, -1)); |
169 |
EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(NULL, -1)); |
170 |
} |
170 |
} |