projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 13fc08e)
* src/c++11/futex.cc: Do not define for gthr-single.h targets.
authorJonathan Wakely <jwakely@redhat.com>
Sun, 1 Feb 2015 15:11:23 +0000 (15:11 +0000)
committerJonathan Wakely <redi@gcc.gnu.org>
Sun, 1 Feb 2015 15:11:23 +0000 (15:11 +0000)
From-SVN: r220319

libstdc++-v3/ChangeLog patch | blob | history
libstdc++-v3/src/c++11/futex.cc patch | blob | history

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 67cfb60ddb3b385abcc5bf0891c3a66775f85216..dbcf81dc55454b265e830426ea0b504181e18023 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-01  Jonathan Wakely  <jwakely@redhat.com>
+
+       * src/c++11/futex.cc: Do not define for gthr-single.h targets.
+
 2015-02-01  Jonathan Wakely  <jwakely@redhat.com>
 
        PR libstdc++/64883
diff --git a/libstdc++-v3/src/c++11/futex.cc b/libstdc++-v3/src/c++11/futex.cc
index 1336779dfb73f811cbdaa913f9912289bf41c56f..a7f02009f112c04ae930aec490a838c82e70a68f 100644 (file)
--- a/libstdc++-v3/src/c++11/futex.cc
+++ b/libstdc++-v3/src/c++11/futex.cc
@@ -23,6 +23,7 @@
 // <http://www.gnu.org/licenses/>.
 
 #include <bits/atomic_futex.h>
+#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
 #if defined(_GLIBCXX_HAVE_LINUX_FUTEX) && ATOMIC_INT_LOCK_FREE > 1
 #include <chrono>
 #include <climits>
@@ -94,3 +95,4 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
 }
 #endif
+#endif