* src/c++11/futex.cc: Fix order of includes and preprocessor condition.

From-SVN: r219816

* src/c++11/futex.cc: Fix order of includes and preprocessor condition.
From-SVN: r219816
1e3919ac · Jonathan Wakely · Jonathan Wakely · 87361f30 · 1e3919ac · 1e3919ac
Commit 1e3919ac authored Jan 18, 2015 by Jonathan Wakely Committed by Jonathan Wakely Jan 18, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

libstdc++-v3/ChangeLog
+2 -0

libstdc++-v3/src/c++11/futex.cc
+1 -2

No files found.
--- 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

--- 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>