Francois Gouget : server: Include either sys/user.h or asm/user.h.
Alexandre Julliard
julliard at winehq.org
Mon Oct 7 14:17:11 CDT 2013
Module: wine
Branch: master
Commit: d3cc10724e4c9b3483f1aa2cddae208b720d4875
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3cc10724e4c9b3483f1aa2cddae208b720d4875
Author: Francois Gouget <fgouget at free.fr>
Date: Sun Oct 6 00:22:24 2013 +0200
server: Include either sys/user.h or asm/user.h.
This avoids redefinitions with old Linux kernel headers.
---
server/ptrace.c | 3 +--
1 files changed, 1 insertions(+), 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
More information about the wine-cvs
mailing list