diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-02-01 15:11:23 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-02-01 15:11:23 +0000 |
| commit | 823e70b9a1131e34167ad12d2dd6cae15871a850 (patch) | |
| tree | f8678114300551457acc594e670dc1760c80e896 /libstdc++-v3 | |
| parent | 1192d5db0f4cea282efd21c3535a84216a42a74f (diff) | |
| download | gcc-823e70b9a1131e34167ad12d2dd6cae15871a850.tar.gz | |
* src/c++11/futex.cc: Do not define for gthr-single.h targets.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220319 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++11/futex.cc | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 67cfb60ddb3..dbcf81dc554 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 1336779dfb7..a7f02009f11 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 |