From afc61dda45cc0673143f978d4977d100d9dd7c37 Mon Sep 17 00:00:00 2001 From: fluffypony Date: Thu, 11 Sep 2014 10:02:24 +0200 Subject: gtest patches for FreeBSD --- tests/gtest/include/gtest/internal/gtest-internal.h | 4 ++++ tests/gtest/include/gtest/internal/gtest-port.h | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/gtest/include/gtest/internal/gtest-internal.h b/tests/gtest/include/gtest/internal/gtest-internal.h index 7aa1197f1..ad5369d61 100644 --- a/tests/gtest/include/gtest/internal/gtest-internal.h +++ b/tests/gtest/include/gtest/internal/gtest-internal.h @@ -44,7 +44,11 @@ # include # include # include +# include #endif // GTEST_OS_LINUX +#if GTEST_CAN_STREAM_RESULTS_ +# include +#endif // GTEST_CAN_STREAM_RESULTS_ #include #include diff --git a/tests/gtest/include/gtest/internal/gtest-port.h b/tests/gtest/include/gtest/internal/gtest-port.h index 157b47f86..ce70acdd3 100644 --- a/tests/gtest/include/gtest/internal/gtest-port.h +++ b/tests/gtest/include/gtest/internal/gtest-port.h @@ -188,6 +188,7 @@ #include #include #include +#include #ifndef _WIN32_WCE # include # include @@ -232,6 +233,9 @@ # ifdef ANDROID # define GTEST_OS_LINUX_ANDROID 1 # endif // ANDROID +#elif defined __FreeBSD__ +# define GTEST_OS_LINUX 1 +# define GTEST_HAS_CLONE 0 #elif defined __MVS__ # define GTEST_OS_ZOS 1 #elif defined(__sun) && defined(__SVR4) @@ -449,7 +453,7 @@ // defining __GNUC__ and friends, but cannot compile GCC's tuple // implementation. MSVC 2008 (9.0) provides TR1 tuple in a 323 MB // Feature Pack download, which we cannot assume the user has. -# if (defined(__GNUC__) && !defined(__CUDACC__) && (GTEST_GCC_VER_ >= 40000)) \ +# if (defined(__GNUC__) && !defined(__CUDACC__) && !defined(_LIBCPP_VERSION) && (GTEST_GCC_VER_ >= 40000)) \ || _MSC_VER >= 1600 # define GTEST_USE_OWN_TR1_TUPLE 0 # else -- cgit v1.2.3