From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1K38m0-0007cH-KC
	for qemu-devel@nongnu.org; Mon, 02 Jun 2008 08:04:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1K38lx-0007Z4-U5
	for qemu-devel@nongnu.org; Mon, 02 Jun 2008 08:04:24 -0400
Received: from [199.232.76.173] (port=40965 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1K38lx-0007Z1-Ph
	for qemu-devel@nongnu.org; Mon, 02 Jun 2008 08:04:21 -0400
Received: from net-214.nrpn.net ([192.89.6.214]:42684 helo=annwn.felipec.org)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <felipe.contreras+annwn@gmail.com>)
	id 1K38lw-0007pQ-Sw
	for qemu-devel@nongnu.org; Mon, 02 Jun 2008 08:04:21 -0400
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Mon,  2 Jun 2008 15:04:18 +0300
Message-Id: <1212408258-30206-1-git-send-email-felipe.contreras@gmail.com>
Subject: [Qemu-devel] [PATCH] Include futex.h properly.
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: QEMU Developers <qemu-devel@nongnu.org>
Cc: Felipe Contreras <felipe.contreras@gmail.com>

This wasn't building properly on my system.
---
 configure            |    2 +-
 linux-user/syscall.c |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 4a4ba36..f204d04 100755
--- a/configure
+++ b/configure
@@ -648,7 +648,7 @@ EOF
 # Check host NPTL support
 cat > $TMPC <<EOF
 #include <sched.h>
-#include <sys/futex.h>
+#include <linux/futex.h>
 void foo()
 {
 #if !defined(CLONE_SETTLS) || !defined(FUTEX_WAIT)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 5f2b48a..25b9e5a 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -52,9 +52,6 @@
 //#include <sys/user.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
-#if defined(USE_NPTL)
-#include <sys/futex.h>
-#endif
 
 #define termios host_termios
 #define winsize host_winsize
@@ -75,6 +72,10 @@
 
 #include "qemu.h"
 
+#if defined(USE_NPTL)
+#include <linux/futex.h>
+#endif
+
 //#define DEBUG
 
 #if defined(TARGET_I386) || defined(TARGET_ARM) || defined(TARGET_SPARC) \
-- 
1.5.6.rc0.29.g3beb5