Initial change for Bug 429952 didn't work well with older GCC. Use the __clang__...

diff --git a/drd/tests/std_thread.cpp b/drd/tests/std_thread.cpp
index 7114e401e8a1963626b71a98bcc3802d7b87af24..0e19cbcc161a9c6e17996484c8534a390f98e219 100644 (file)
--- 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 eef5ba30ffbebfa83e654ea159ae4bcc9cbe0d2c..ab764e8e27d29cfd4f9d60becf365788b91b0f29 100644 (file)
--- 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
 //