From 383e463e1a0f3b6b1ba4783de4d490956b9ea7a7 Mon Sep 17 00:00:00 2001 From: Paul Floyd Date: Wed, 9 Dec 2020 08:55:55 +0100 Subject: [PATCH] Initial change for Bug 429952 didn't work well with older GCC. Use the __clang__ macro instead. --- drd/tests/std_thread.cpp | 2 +- drd/tests/std_thread2.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drd/tests/std_thread.cpp b/drd/tests/std_thread.cpp index 7114e401e8..0e19cbcc16 100644 --- a/drd/tests/std_thread.cpp +++ b/drd/tests/std_thread.cpp @@ -21,7 +21,7 @@ int main(int argc, char** argv) return 0; } -#if defined(__GNUC__) && __GNUC__ -0 < 6 && (defined(_GLIBCXX_THREAD_ABI_COMPAT) && _GLIBCXX_THREAD_ABI_COMPAT) +#if defined(__GNUC__) && __GNUC__ -0 < 6 && !defined(__clang__) // // From libstdc++-v3/src/c++11/thread.cc // diff --git a/drd/tests/std_thread2.cpp b/drd/tests/std_thread2.cpp index eef5ba30ff..ab764e8e27 100644 --- a/drd/tests/std_thread2.cpp +++ b/drd/tests/std_thread2.cpp @@ -26,7 +26,7 @@ int main(int argc, char** argv) return 0; } -#if defined(__GNUC__) && __GNUC__ -0 < 6 && (defined(_GLIBCXX_THREAD_ABI_COMPAT) && _GLIBCXX_THREAD_ABI_COMPAT) +#if defined(__GNUC__) && __GNUC__ -0 < 6 && !defined(__clang__) // // From libstdc++-v3/src/c++11/thread.cc // -- 2.47.3