Do not include sys/ptrace.h and sys/user.h unconditionally.

configure.in

@@ -792,6 +792,7 @@ AC_CHECK_HEADERS(\
 	sys/mount.h \
 	sys/msg.h \
 	sys/param.h \
+	sys/ptrace.h \
 	sys/reg.h \
 	sys/signal.h \
 	sys/shm.h \
@@ -800,6 +801,7 @@ AC_CHECK_HEADERS(\
 	sys/statfs.h \
 	sys/strtio.h \
 	sys/syscall.h \
+	sys/user.h \
 	sys/wait.h \
 	sys/v86.h \
 	sys/v86intr.h \

dlls/ntdll/signal_i386.c

@@ -29,6 +29,10 @@
 # include <sys/vm86.h>
 #endif
 
+#ifdef HAVE_SYS_SIGNAL_H
+# include <sys/signal.h>
+#endif
+
 #include "winnt.h"
 #include "selectors.h"
 

include/config.h.in

@@ -401,6 +401,9 @@
 /* Define if you have the <sys/param.h> header file.  */
 #undef HAVE_SYS_PARAM_H
 
+/* Define if you have the <sys/ptrace.h> header file.  */
+#undef HAVE_SYS_PTRACE_H
+
 /* Define if you have the <sys/reg.h> header file.  */
 #undef HAVE_SYS_REG_H
 
@@ -428,6 +431,9 @@
 /* Define if you have the <sys/syscall.h> header file.  */
 #undef HAVE_SYS_SYSCALL_H
 
+/* Define if you have the <sys/user.h> header file.  */
+#undef HAVE_SYS_USER_H
+
 /* Define if you have the <sys/v86.h> header file.  */
 #undef HAVE_SYS_V86_H
 

server/context_i386.c

@@ -14,14 +14,17 @@
 #include <sys/reg.h>
 #endif
 #include <unistd.h>
-#include <sys/ptrace.h>
+#ifdef HAVE_SYS_PTRACE_H
+# include <sys/ptrace.h>
+#endif
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif
-#include <sys/user.h>
+#ifdef HAVE_SYS_USER_H
+# include <sys/user.h>
+#endif
 
 #include "winbase.h"
-
 #include "thread.h"
 #include "request.h"
 

server/ptrace.c

@@ -11,9 +11,11 @@
 #include <stdio.h>
 #include <signal.h>
 #include <sys/types.h>
-#include <sys/ptrace.h>
+#ifdef HAVE_SYS_PTRACE_H
+# include <sys/ptrace.h>
+#endif
 #ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
+# include <sys/wait.h>
 #endif
 #include <unistd.h>
 
@@ -37,7 +39,19 @@
 #define PTRACE_POKEDATA PT_WRITE_D
 #endif
 
+#ifdef HAVE_SYS_PTRACE_H
 static const int use_ptrace = 1;  /* set to 0 to disable ptrace */
+#else
+static const int use_ptrace = 0;
+
+#define PT_CONTINUE 0
+#define PT_ATTACH   1
+#define PT_DETACH   2
+#define PT_READ_D   3
+#define PT_WRITE_D  4
+
+static int ptrace(int req, ...) { return -1; /*FAIL*/ }
+#endif
 
 /* handle a status returned by wait4 */
 static int handle_child_status( struct thread *thread, int pid, int status )

server/request.c

@@ -33,6 +33,7 @@
 #include "server.h"
 #define WANT_REQUEST_HANDLERS
 #include "request.h"
+#include "wine/port.h"
 
 /* Some versions of glibc don't define this */
 #ifndef SCM_RIGHTS

win32/device.c

@@ -85,7 +85,6 @@ static BOOL DeviceIo_HASP (DWORD dwIoControlCode,
 			      LPDWORD lpcbBytesReturned,
 			      LPOVERLAPPED lpOverlapped);
 /*
-/*
  * VxD names are taken from the Win95 DDK
  */