gwj / at91sam9263 · Commits

Commit 30813cea9b6166f2302a973d57c5818273f6c4d2

Authored by pbrook
1 parent f5b78d4f

Fix location of futex.h. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4653 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 5 additions and 4 deletions
configure
  View file @30813ce
@@ -648,7 +648,7 @@ EOF @@ -648,7 +648,7 @@ EOF
648 # Check host NPTL support 648 # Check host NPTL support
649 cat > $TMPC <<EOF 649 cat > $TMPC <<EOF
650 #include <sched.h> 650 #include <sched.h>
651 -#include <sys/futex.h> 651 +#include <linux/futex.h>
652 void foo() 652 void foo()
653 { 653 {
654 #if !defined(CLONE_SETTLS) || !defined(FUTEX_WAIT) 654 #if !defined(CLONE_SETTLS) || !defined(FUTEX_WAIT)
linux-user/syscall.c
  View file @30813ce
@@ -52,9 +52,6 @@ @@ -52,9 +52,6 @@
52 //#include <sys/user.h> 52 //#include <sys/user.h>
53 #include <netinet/ip.h> 53 #include <netinet/ip.h>
54 #include <netinet/tcp.h> 54 #include <netinet/tcp.h>
55 -#if defined(USE_NPTL)  
56 -#include <sys/futex.h>  
57 -#endif  
58 55
59 #define termios host_termios 56 #define termios host_termios
60 #define winsize host_winsize 57 #define winsize host_winsize
@@ -75,6 +72,10 @@ @@ -75,6 +72,10 @@
75 72
76 #include "qemu.h" 73 #include "qemu.h"
77 74
  75 +#if defined(USE_NPTL)
  76 +#include <linux/futex.h>
  77 +#endif
  78 +
78 //#define DEBUG 79 //#define DEBUG
79 80
80 #if defined(TARGET_I386) || defined(TARGET_ARM) || defined(TARGET_SPARC) \ 81 #if defined(TARGET_I386) || defined(TARGET_ARM) || defined(TARGET_SPARC) \