summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2008-06-02 15:45:44 +0000
committerpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2008-06-02 15:45:44 +0000
commit30813cea9b6166f2302a973d57c5818273f6c4d2 (patch)
treee41c51c66bddb4150a23e44e1ac6cc8c37e5bfaf
parentf5b78d4fead85fdcea86c820c45557d98b4313ad (diff)
downloadhqemu-30813cea9b6166f2302a973d57c5818273f6c4d2.zip
hqemu-30813cea9b6166f2302a973d57c5818273f6c4d2.tar.gz
Fix location of futex.h.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4653 c046a42c-6fe2-441c-8c8c-71466251a162
-rwxr-xr-xconfigure2
-rw-r--r--linux-user/syscall.c7
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) \
OpenPOWER on IntegriCloud