From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1K3CEO-000128-Uz
	for qemu-devel@nongnu.org; Mon, 02 Jun 2008 11:45:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1K3CEN-00011D-4E
	for qemu-devel@nongnu.org; Mon, 02 Jun 2008 11:45:56 -0400
Received: from [199.232.76.173] (port=45983 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1K3CEM-00011A-Qv
	for qemu-devel@nongnu.org; Mon, 02 Jun 2008 11:45:54 -0400
Received: from savannah.gnu.org ([199.232.41.3]:59239 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <paul@nowt.org>) id 1K3CEM-00027p-UY
	for qemu-devel@nongnu.org; Mon, 02 Jun 2008 11:45:55 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63) (envelope-from <paul@nowt.org>)
	id 1K3CEG-0001MN-PS
	for qemu-devel@nongnu.org; Mon, 02 Jun 2008 15:45:49 +0000
Received: from pbrook by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <pbrook@savannah.gnu.org>) id 1K3CEF-0001M8-EX
	for qemu-devel@nongnu.org; Mon, 02 Jun 2008 15:45:47 +0000
MIME-Version: 1.0
Errors-To: pbrook
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Paul Brook <paul@nowt.org>
Message-Id: <E1K3CEF-0001M8-EX@cvs.savannah.gnu.org>
Date: Mon, 02 Jun 2008 15:45:47 +0000
Subject: [Qemu-devel] [4653] Fix location of futex.h.
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-devel@nongnu.org

Revision: 4653
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4653
Author:   pbrook
Date:     2008-06-02 15:45:44 +0000 (Mon, 02 Jun 2008)

Log Message:
-----------
Fix location of futex.h.

Modified Paths:
--------------
    trunk/configure
    trunk/linux-user/syscall.c

Modified: trunk/configure
===================================================================
--- trunk/configure	2008-06-02 09:35:46 UTC (rev 4652)
+++ trunk/configure	2008-06-02 15:45:44 UTC (rev 4653)
@@ -648,7 +648,7 @@
 # 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)

Modified: trunk/linux-user/syscall.c
===================================================================
--- trunk/linux-user/syscall.c	2008-06-02 09:35:46 UTC (rev 4652)
+++ trunk/linux-user/syscall.c	2008-06-02 15:45:44 UTC (rev 4653)
@@ -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) \