Module: wine Branch: master Commit: 2a32d5765a1d07e07c73c727eedcf5a7db3b261c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a32d5765a1d07e07c73c727ee...
Author: Huw Davies huw@codeweavers.com Date: Tue Sep 24 16:13:27 2013 +0100
server: Android has struct user in asm/user.h.
---
configure | 1 + configure.ac | 1 + include/config.h.in | 3 +++ server/ptrace.c | 8 +++++++- 4 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/configure b/configure index d1cd164..58f2579 100755 --- a/configure +++ b/configure @@ -5949,6 +5949,7 @@ for ac_header in \ arpa/inet.h \ arpa/nameser.h \ asm/types.h \ + asm/user.h \ curses.h \ direct.h \ dirent.h \ diff --git a/configure.ac b/configure.ac index 0fce454..1055b0a 100644 --- a/configure.ac +++ b/configure.ac @@ -409,6 +409,7 @@ AC_CHECK_HEADERS(\ arpa/inet.h \ arpa/nameser.h \ asm/types.h \ + asm/user.h \ curses.h \ direct.h \ dirent.h \ diff --git a/include/config.h.in b/include/config.h.in index 5863d10..01e484e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -35,6 +35,9 @@ /* Define to 1 if you have the <asm/types.h> header file. */ #undef HAVE_ASM_TYPES_H
+/* Define to 1 if you have the <asm/user.h> header file. */ +#undef HAVE_ASM_USER_H + /* Define to 1 if you have the <AudioToolbox/AudioConverter.h> header file. */ #undef HAVE_AUDIOTOOLBOX_AUDIOCONVERTER_H
diff --git a/server/ptrace.c b/server/ptrace.c index ed72b7d..9897a08 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -528,9 +528,15 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base, }
-#if defined(linux) && defined(HAVE_SYS_USER_H) && (defined(__i386__) || defined(__x86_64__)) +#if defined(linux) && (defined(HAVE_SYS_USER_H) || defined(HAVE_ASM_USER_H)) \ + && (defined(__i386__) || defined(__x86_64__))
+#ifdef HAVE_SYS_USER_H #include <sys/user.h> +#endif +#ifdef HAVE_ASM_USER_H +#include <asm/user.h> +#endif
/* debug register offset in struct user */ #define DR_OFFSET(dr) ((((struct user *)0)->u_debugreg) + (dr))