aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2015-02-01 15:11:23 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2015-02-01 15:11:23 +0000
commit516db2dd078c8f9fac7a3dd3ec9ef383570b1dfb (patch)
treef8678114300551457acc594e670dc1760c80e896 /libstdc++-v3
parent13fc08e44e4e4893b2b3f1f3d7c1c9c40d6b8b7d (diff)
downloadgcc-516db2dd078c8f9fac7a3dd3ec9ef383570b1dfb.zip
gcc-516db2dd078c8f9fac7a3dd3ec9ef383570b1dfb.tar.gz
gcc-516db2dd078c8f9fac7a3dd3ec9ef383570b1dfb.tar.bz2
* src/c++11/futex.cc: Do not define for gthr-single.h targets.
From-SVN: r220319
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/src/c++11/futex.cc2
2 files changed, 6 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 67cfb60..dbcf81d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,9 @@
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
* include/c_global/cstdio (gets): Use __deprecated__ attribute instead
of deprecated.
diff --git a/libstdc++-v3/src/c++11/futex.cc b/libstdc++-v3/src/c++11/futex.cc
index 1336779..a7f0200 100644
--- 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