Hi,
#include portability fixes for server/*
Cheers,
Jon
__________________________________
Do you Yahoo!?
The New Yahoo! Shopping - with improved product search
http://shopping.yahoo.com
diff -ur wine/server/async.c wine-test/server/async.c
--- wine/server/async.c 2003-10-23 21:10:43.000000000 +0100
+++ wine-test/server/async.c 2003-10-23 21:17:29.000000000 +0100
@@ -22,9 +22,15 @@
#include "config.h"
#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include <stdio.h>
#include "handle.h"
diff -ur wine/server/atom.c wine-test/server/atom.c
--- wine/server/atom.c 2003-10-23 21:10:43.000000000 +0100
+++ wine-test/server/atom.c 2003-10-23 21:17:29.000000000 +0100
@@ -23,9 +23,13 @@
#include "wine/port.h"
#include <assert.h>
-#include <stdlib.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
#include <stdio.h>
-#include <string.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
#include "unicode.h"
#include "request.h"
diff -ur wine/server/change.c wine-test/server/change.c
--- wine/server/change.c 2003-10-23 21:10:43.000000000 +0100
+++ wine-test/server/change.c 2003-10-23 21:17:30.000000000 +0100
@@ -24,7 +24,9 @@
#include <assert.h>
#include <fcntl.h>
#include <stdio.h>
-#include <stdlib.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
#include <signal.h>
#include "windef.h"
diff -ur wine/server/clipboard.c wine-test/server/clipboard.c
--- wine/server/clipboard.c 2003-10-23 21:10:43.000000000 +0100
+++ wine-test/server/clipboard.c 2003-10-23 21:17:30.000000000 +0100
@@ -22,9 +22,13 @@
#include "wine/port.h"
#include <assert.h>
-#include <stdlib.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
#include <stdio.h>
-#include <string.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
#include "request.h"
#include "object.h"
diff -ur wine/server/console.c wine-test/server/console.c
--- wine/server/console.c 2003-10-23 21:10:46.000000000 +0100
+++ wine-test/server/console.c 2003-10-23 21:17:30.000000000 +0100
@@ -24,9 +24,13 @@
#include "wine/port.h"
#include <assert.h>
-#include <string.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
#include <stdio.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include <signal.h>
#include "handle.h"
diff -ur wine/server/context_i386.c wine-test/server/context_i386.c
--- wine/server/context_i386.c 2003-10-23 21:10:47.000000000 +0100
+++ wine-test/server/context_i386.c 2003-10-23 21:17:30.000000000 +0100
@@ -28,7 +28,9 @@
#include <sys/reg.h>
#endif
#include <stdarg.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#ifdef HAVE_SYS_PTRACE_H
# include <sys/ptrace.h>
#endif
diff -ur wine/server/context_powerpc.c wine-test/server/context_powerpc.c
--- wine/server/context_powerpc.c 2003-10-23 21:10:47.000000000 +0100
+++ wine-test/server/context_powerpc.c 2003-10-23 21:17:30.000000000 +0100
@@ -24,12 +24,16 @@
#include <assert.h>
#include <errno.h>
-#include <sys/types.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
#ifdef HAVE_SYS_REG_H
# include <sys/reg.h>
#endif
#include <stdarg.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#ifdef HAVE_SYS_PTRACE_H
# include <sys/ptrace.h>
#endif
diff -ur wine/server/context_sparc.c wine-test/server/context_sparc.c
--- wine/server/context_sparc.c 2003-10-23 21:10:47.000000000 +0100
+++ wine-test/server/context_sparc.c 2003-10-23 21:17:30.000000000 +0100
@@ -24,12 +24,16 @@
#include <assert.h>
#include <errno.h>
-#include <sys/types.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
#ifdef HAVE_SYS_REG_H
# include <sys/reg.h>
#endif
#include <stdarg.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#ifdef HAVE_SYS_PTRACE_H
# include <sys/ptrace.h>
#endif
diff -ur wine/server/debugger.c wine-test/server/debugger.c
--- wine/server/debugger.c 2003-10-23 21:10:48.000000000 +0100
+++ wine-test/server/debugger.c 2003-10-23 21:17:30.000000000 +0100
@@ -23,7 +23,9 @@
#include <assert.h>
#include <signal.h>
-#include <string.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
#include <stdarg.h>
#include <stdio.h>
diff -ur wine/server/device.c wine-test/server/device.c
--- wine/server/device.c 2003-10-23 21:10:48.000000000 +0100
+++ wine-test/server/device.c 2003-10-23 21:17:30.000000000 +0100
@@ -24,12 +24,17 @@
* client-side device support.
*/
+#include "config.h"
#include <assert.h>
#include <fcntl.h>
#include <stdarg.h>
#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
#include "windef.h"
#include "winbase.h"
diff -ur wine/server/event.c wine-test/server/event.c
--- wine/server/event.c 2003-10-23 21:10:48.000000000 +0100
+++ wine-test/server/event.c 2003-10-23 21:17:30.000000000 +0100
@@ -23,7 +23,9 @@
#include <assert.h>
#include <stdio.h>
-#include <stdlib.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
#include "windef.h"
diff -ur wine/server/fd.c wine-test/server/fd.c
--- wine/server/fd.c 2003-10-23 21:10:49.000000000 +0100
+++ wine-test/server/fd.c 2003-10-23 21:17:31.000000000 +0100
@@ -27,15 +27,27 @@
#include <limits.h>
#include <signal.h>
#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
#ifdef HAVE_SYS_POLL_H
#include <sys/poll.h>
#endif
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include "object.h"
#include "file.h"
diff -ur wine/server/file.c wine-test/server/file.c
--- wine/server/file.c 2003-10-23 21:10:50.000000000 +0100
+++ wine-test/server/file.c 2003-10-23 21:17:31.000000000 +0100
@@ -25,17 +25,29 @@
#include <fcntl.h>
#include <stdarg.h>
#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
#include <errno.h>
#ifdef HAVE_SYS_ERRNO_H
#include <sys/errno.h>
#endif
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
#include <time.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#ifdef HAVE_UTIME_H
#include <utime.h>
#endif
diff -ur wine/server/handle.c wine-test/server/handle.c
--- wine/server/handle.c 2003-10-23 21:10:50.000000000 +0100
+++ wine-test/server/handle.c 2003-10-23 21:17:31.000000000 +0100
@@ -23,10 +23,14 @@
#include <assert.h>
#include <limits.h>
-#include <string.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
#include <stdarg.h>
#include <stdio.h>
-#include <stdlib.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
#include "windef.h"
#include "winbase.h"
diff -ur wine/server/main.c wine-test/server/main.c
--- wine/server/main.c 2003-10-23 21:10:51.000000000 +0100
+++ wine-test/server/main.c 2003-10-23 21:17:31.000000000 +0100
@@ -18,14 +18,21 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "config.h"
#include <assert.h>
#include <ctype.h>
#include <fcntl.h>
#include <signal.h>
#include <stdio.h>
-#include <stdlib.h>
-#include <sys/time.h>
-#include <unistd.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include "object.h"
#include "file.h"
diff -ur wine/server/mapping.c wine-test/server/mapping.c
--- wine/server/mapping.c 2003-10-23 21:10:52.000000000 +0100
+++ wine-test/server/mapping.c 2003-10-23 21:17:31.000000000 +0100
@@ -24,9 +24,15 @@
#include <assert.h>
#include <stdarg.h>
#include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <unistd.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include "windef.h"
#include "winbase.h"
diff -ur wine/server/mutex.c wine-test/server/mutex.c
--- wine/server/mutex.c 2003-10-23 21:10:52.000000000 +0100
+++ wine-test/server/mutex.c 2003-10-23 21:17:31.000000000 +0100
@@ -23,7 +23,9 @@
#include <assert.h>
#include <stdio.h>
-#include <stdlib.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
#include "windef.h"
diff -ur wine/server/named_pipe.c wine-test/server/named_pipe.c
--- wine/server/named_pipe.c 2003-10-23 21:10:52.000000000 +0100
+++ wine-test/server/named_pipe.c 2003-10-23 21:17:31.000000000 +0100
@@ -27,17 +27,27 @@
#include <assert.h>
#include <fcntl.h>
-#include <string.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
#include <stdarg.h>
#include <stdio.h>
-#include <stdlib.h>
-#include <sys/time.h>
-#include <sys/types.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
#include <time.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include "windef.h"
#include "winbase.h"
diff -ur wine/server/object.c wine-test/server/object.c
--- wine/server/object.c 2003-10-23 21:10:53.000000000 +0100
+++ wine-test/server/object.c 2003-10-23 21:17:31.000000000 +0100
@@ -23,10 +23,16 @@
#include <assert.h>
#include <limits.h>
-#include <stdlib.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include "file.h"
#include "thread.h"
diff -ur wine/server/process.c wine-test/server/process.c
--- wine/server/process.c 2003-10-23 21:10:54.000000000 +0100
+++ wine-test/server/process.c 2003-10-23 21:17:31.000000000 +0100
@@ -24,15 +24,23 @@
#include <assert.h>
#include <limits.h>
#include <signal.h>
-#include <string.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
#include <stdarg.h>
#include <stdio.h>
-#include <stdlib.h>
-#include <sys/time.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
#ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include "windef.h"
#include "winbase.h"
diff -ur wine/server/ptrace.c wine-test/server/ptrace.c
--- wine/server/ptrace.c 2003-10-23 21:10:54.000000000 +0100
+++ wine-test/server/ptrace.c 2003-10-23 21:17:32.000000000 +0100
@@ -24,14 +24,18 @@
#include <errno.h>
#include <stdio.h>
#include <signal.h>
-#include <sys/types.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
#ifdef HAVE_SYS_PTRACE_H
# include <sys/ptrace.h>
#endif
#ifdef HAVE_SYS_WAIT_H
# include <sys/wait.h>
#endif
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include "file.h"
#include "process.h"
diff -ur wine/server/queue.c wine-test/server/queue.c
--- wine/server/queue.c 2003-10-23 21:10:56.000000000 +0100
+++ wine-test/server/queue.c 2003-10-23 21:17:32.000000000 +0100
@@ -24,7 +24,9 @@
#include <assert.h>
#include <stdarg.h>
#include <stdio.h>
-#include <stdlib.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
#include "windef.h"
#include "winbase.h"
diff -ur wine/server/registry.c wine-test/server/registry.c
--- wine/server/registry.c 2003-10-23 21:10:57.000000000 +0100
+++ wine-test/server/registry.c 2003-10-23 21:17:32.000000000 +0100
@@ -34,10 +34,18 @@
#include <limits.h>
#include <stdio.h>
#include <stdarg.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <unistd.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include "object.h"
#include "file.h"
diff -ur wine/server/request.c wine-test/server/request.c
--- wine/server/request.c 2003-10-23 21:10:57.000000000 +0100
+++ wine-test/server/request.c 2003-10-23 21:17:32.000000000 +0100
@@ -29,12 +29,22 @@
#endif
#include <signal.h>
#include <stdio.h>
-#include <stdlib.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
#include <stdarg.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
#ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
@@ -47,7 +57,9 @@
#ifdef HAVE_SYS_UN_H
#include <sys/un.h>
#endif
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include "windef.h"
#include "winbase.h"
diff -ur wine/server/semaphore.c wine-test/server/semaphore.c
--- wine/server/semaphore.c 2003-10-23 21:10:57.000000000 +0100
+++ wine-test/server/semaphore.c 2003-10-23 21:17:32.000000000 +0100
@@ -23,7 +23,9 @@
#include <assert.h>
#include <stdio.h>
-#include <stdlib.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
#include "windef.h"
diff -ur wine/server/serial.c wine-test/server/serial.c
--- wine/server/serial.c 2003-10-23 21:10:58.000000000 +0100
+++ wine-test/server/serial.c 2003-10-23 21:17:32.000000000 +0100
@@ -27,12 +27,22 @@
#include <fcntl.h>
#include <stdarg.h>
#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/time.h>
-#include <sys/types.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
#include <time.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#ifdef HAVE_UTIME_H
#include <utime.h>
#endif
diff -ur wine/server/signal.c wine-test/server/signal.c
--- wine/server/signal.c 2003-10-23 21:10:58.000000000 +0100
+++ wine-test/server/signal.c 2003-10-23 21:17:32.000000000 +0100
@@ -25,7 +25,9 @@
#ifdef HAVE_SYS_POLL_H
#include <sys/poll.h>
#endif
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include "file.h"
#include "object.h"
diff -ur wine/server/smb.c wine-test/server/smb.c
--- wine/server/smb.c 2003-10-23 21:10:58.000000000 +0100
+++ wine-test/server/smb.c 2003-10-23 21:17:32.000000000 +0100
@@ -28,12 +28,22 @@
#include <fcntl.h>
#include <stdarg.h>
#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/time.h>
-#include <sys/types.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
#include <time.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#ifdef HAVE_UTIME_H
#include <utime.h>
#endif
diff -ur wine/server/snapshot.c wine-test/server/snapshot.c
--- wine/server/snapshot.c 2003-10-23 21:10:58.000000000 +0100
+++ wine-test/server/snapshot.c 2003-10-23 21:17:33.000000000 +0100
@@ -25,7 +25,9 @@
#include <assert.h>
#include <stdio.h>
-#include <stdlib.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
#include "windef.h"
diff -ur wine/server/sock.c wine-test/server/sock.c
--- wine/server/sock.c 2003-10-23 21:10:59.000000000 +0100
+++ wine-test/server/sock.c 2003-10-23 21:17:33.000000000 +0100
@@ -27,14 +27,22 @@
#include <fcntl.h>
#include <stdarg.h>
#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
#include <errno.h>
#ifdef HAVE_SYS_ERRNO_H
# include <sys/errno.h>
#endif
-#include <sys/time.h>
-#include <sys/types.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
#ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
@@ -45,7 +53,9 @@
# include <sys/filio.h>
#endif
#include <time.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include "windef.h"
#include "winbase.h"
diff -ur wine/server/thread.c wine-test/server/thread.c
--- wine/server/thread.c 2003-10-23 21:10:59.000000000 +0100
+++ wine-test/server/thread.c 2003-10-23 21:17:33.000000000 +0100
@@ -27,10 +27,18 @@
#include <signal.h>
#include <stdarg.h>
#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <unistd.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include <time.h>
#include "windef.h"
diff -ur wine/server/timer.c wine-test/server/timer.c
--- wine/server/timer.c 2003-10-23 21:11:00.000000000 +0100
+++ wine-test/server/timer.c 2003-10-23 21:17:33.000000000 +0100
@@ -23,9 +23,15 @@
#include <assert.h>
#include <stdio.h>
-#include <stdlib.h>
-#include <sys/time.h>
-#include <sys/types.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
#include "windef.h"
diff -ur wine/server/token.c wine-test/server/token.c
--- wine/server/token.c 2003-10-23 21:11:00.000000000 +0100
+++ wine-test/server/token.c 2003-10-23 21:17:33.000000000 +0100
@@ -23,7 +23,9 @@
#include <assert.h>
#include <stdio.h>
-#include <stdlib.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
#include "windef.h"
diff -ur wine/server/trace.c wine-test/server/trace.c
--- wine/server/trace.c 2003-10-23 21:11:01.000000000 +0100
+++ wine-test/server/trace.c 2003-10-23 21:17:33.000000000 +0100
@@ -24,7 +24,9 @@
#include <ctype.h>
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
#ifdef HAVE_SYS_UIO_H
#include <sys/uio.h>
