marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

oldstable
Huw Davies 2013-09-24 16:13:27 +01:00 committed by Alexandre Julliard
parent 8555e77b0e
commit 2a32d5765a
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

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

1
configure.ac
View File

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

3
include/config.h.in
View File

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

8
server/ptrace.c
View File

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