server: Include either sys/user.h or asm/user.h.

Francois Gouget fgouget at free.fr
Sat Oct 5 17:22:24 CDT 2013


This avoids redefinitions with old Linux kernel headers.
---
 server/ptrace.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/server/ptrace.c b/server/ptrace.c
index 9897a08..aea821d 100644
--- a/server/ptrace.c
+++ b/server/ptrace.c
@@ -533,8 +533,7 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base,
 
 #ifdef HAVE_SYS_USER_H
 #include <sys/user.h>
-#endif
-#ifdef HAVE_ASM_USER_H
+#elif defined(HAVE_ASM_USER_H)
 #include <asm/user.h>
 #endif
 
-- 
1.8.4.rc3



More information about the wine-patches mailing list