Merge "Remove an Android hack and support building with uapi headers too."idea133

2 files changed, 6 insertions, 4 deletions

diff --git a/defs.h b/defs.h
index 6aa76118..7251f683 100644
--- a/defs.h
+++ b/defs.h
@@ -315,13 +315,19 @@ extern int mp_ioctl (int f, int c, void *a, int s);
 #  define PTRACE_GETSIGINFO	0x4202
 # endif
 # if !HAVE_DECL_PTRACE_O_TRACEFORK
+#  ifndef PTRACE_O_TRACEFORK
 #  define PTRACE_O_TRACEFORK	0x00000002
+#  endif
 # endif
 # if !HAVE_DECL_PTRACE_O_TRACEVFORK
+#  ifndef PTRACE_O_TRACEVFORK
 #  define PTRACE_O_TRACEVFORK	0x00000004
+#  endif
 # endif
 # if !HAVE_DECL_PTRACE_O_TRACECLONE
+#  ifndef PTRACE_O_TRACECLONE
 #  define PTRACE_O_TRACECLONE	0x00000008
+#  endif
 # endif
 
 # if !HAVE_DECL_PTRACE_EVENT_FORK
diff --git a/process.c b/process.c
index 1ffe649e..56d68f30 100644
--- a/process.c
+++ b/process.c
@@ -45,11 +45,7 @@
 #include <sys/wait.h>
 #include <sys/resource.h>
 #include <sys/utsname.h>
-#ifdef HAVE_ANDROID_OS
-#include <asm/user.h>
-#else
 #include <sys/user.h>
-#endif
 #include <sys/syscall.h>
 #include <signal.h>
 #ifdef SUNOS4