diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2015-01-18 14:38:53 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2015-01-18 14:38:53 +0000 |
| commit | 1e3919acb126af62dc48fe58816515dfa10e822f (patch) | |
| tree | 99ae3d5b2bec1b84ca868e03dcefcfa2a83de491 | |
| parent | 87361f3098d399531bc329b2ad71f6a530742567 (diff) | |
| download | gcc-1e3919acb126af62dc48fe58816515dfa10e822f.zip gcc-1e3919acb126af62dc48fe58816515dfa10e822f.tar.gz gcc-1e3919acb126af62dc48fe58816515dfa10e822f.tar.bz2 | |
* src/c++11/futex.cc: Fix order of includes and preprocessor condition.
From-SVN: r219816
| -rw-r--r-- | libstdc++-v3/ChangeLog | 2 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++11/futex.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 178da52..3c4b998 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -4,6 +4,8 @@ atomic int is not lock-free. Make member variables private. * src/c++11/futex.cc: Likewise. + * src/c++11/futex.cc: Fix order of includes and preprocessor condition. + 2015-01-17 Jonathan Wakely <jwakely@redhat.com> PR libstdc++/64638 diff --git a/libstdc++-v3/src/c++11/futex.cc b/libstdc++-v3/src/c++11/futex.cc index f24b44e..1336779 100644 --- a/libstdc++-v3/src/c++11/futex.cc +++ b/libstdc++-v3/src/c++11/futex.cc @@ -22,9 +22,8 @@ // see the files COPYING3 and COPYING.RUNTIME respectively. If not, see // <http://www.gnu.org/licenses/>. -#include <bits/c++config.h> -#if defined(_GLIBCXX_HAVE_LINUX_FUTEX) && ATOMIC_INT_LOCK_FREE > 1 #include <bits/atomic_futex.h> +#if defined(_GLIBCXX_HAVE_LINUX_FUTEX) && ATOMIC_INT_LOCK_FREE > 1 #include <chrono> #include <climits> #include <syscall.h> |