server: Android has struct user in asm/user.h.

2a32d576 · Huw Davies · Alexandre Julliard · 8555e77b · 2a32d576 · 2a32d576
Commit 2a32d576 authored Sep 24, 2013 by Huw Davies Committed by Alexandre Julliard Sep 24, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 1 deletion

configure configure +1 -0

configure.ac configure.ac +1 -0

config.h.in include/config.h.in +3 -0

ptrace.c server/ptrace.c +7 -1

No files found.
--- 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 \

--- 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 \

--- 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


--- 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))