summaryrefslogtreecommitdiffstats
path: root/googletest/test/googletest-port-test.cc
diff options
context:
space:
mode:
authorEnji Cooper <yaneurabeya@gmail.com>2019-02-13 06:43:07 (GMT)
committerEnji Cooper <yaneurabeya@gmail.com>2019-02-13 06:43:07 (GMT)
commit96826743ea0addf96d84a28497c000999e9c1da9 (patch)
tree86891eeae9aa76f45b8dc0bff92425c2ae88b884 /googletest/test/googletest-port-test.cc
parentc4ccab33aaa0e86741db7c02a1d1040af76bd059 (diff)
downloadgoogletest-96826743ea0addf96d84a28497c000999e9c1da9.zip
googletest-96826743ea0addf96d84a28497c000999e9c1da9.tar.gz
googletest-96826743ea0addf96d84a28497c000999e9c1da9.tar.bz2
Import `patch-bsd-defines` from FreeBSD ports [1]
As noted in the patch description: * Add DragonFly and GNU/kFreeBSD support. * Implement GetThreadCount() for BSDs. 1. https://svnweb.freebsd.org/ports/head/devel/googletest/files/patch-bsd-defines?revision=488934 Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
Diffstat (limited to 'googletest/test/googletest-port-test.cc')
-rw-r--r--googletest/test/googletest-port-test.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/googletest/test/googletest-port-test.cc b/googletest/test/googletest-port-test.cc
index 8d6aa28..39b643b 100644
--- a/googletest/test/googletest-port-test.cc
+++ b/googletest/test/googletest-port-test.cc
@@ -286,7 +286,9 @@ TEST(FormatCompilerIndependentFileLocationTest, FormatsUknownFileAndLine) {
EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(nullptr, -1));
}
-#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA
+#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA || \
+ GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \
+ GTEST_OS_NETBSD || GTEST_OS_OPENBSD
void* ThreadFunc(void* data) {
internal::Mutex* mutex = static_cast<internal::Mutex*>(data);
mutex->Lock();