diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-02-13 19:07:32 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-02-13 19:07:33 (GMT) |
| commit | 54ec41f000189e89c5cfa8b115c6512cfdc0a21b (patch) | |
| tree | a699730ce7bb9c56c62a8e78af3c0ae8d91509ee /googletest/test | |
| parent | f73b2fb39efcac92d3e9fe079e4f7c809baa975e (diff) | |
| parent | 96826743ea0addf96d84a28497c000999e9c1da9 (diff) | |
| download | googletest-54ec41f000189e89c5cfa8b115c6512cfdc0a21b.zip googletest-54ec41f000189e89c5cfa8b115c6512cfdc0a21b.tar.gz googletest-54ec41f000189e89c5cfa8b115c6512cfdc0a21b.tar.bz2 | |
Merge pull request #2121 from ngie-eign:add-dragonflybsd-and-kfreebsd-support
PiperOrigin-RevId: 233789488
Diffstat (limited to 'googletest/test')
| -rw-r--r-- | googletest/test/googletest-port-test.cc | 4 |
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(); |