Sorry about sending these in pieces last time. Changelog: porting fixes Index: sock.c =================================================================== RCS file: /home/wine/wine/server/sock.c,v retrieving revision 1.41 diff -u -r1.41 sock.c --- sock.c 30 Jan 2003 00:26:44 -0000 1.41 +++ sock.c 31 Jan 2003 21:21:27 -0000 @@ -37,7 +37,9 @@ #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif +#ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> +#endif #ifdef HAVE_SYS_FILIO_H # include <sys/filio.h> #endif Index: smb.c =================================================================== RCS file: /home/wine/wine/server/smb.c,v retrieving revision 1.5 diff -u -r1.5 smb.c --- smb.c 30 Jan 2003 00:26:44 -0000 1.5 +++ smb.c 31 Jan 2003 21:19:02 -0000 @@ -33,9 +33,15 @@ #include <sys/types.h> #include <time.h> #include <unistd.h> +#ifdef HAVE_UTIME_H #include <utime.h> +#endif +#ifdef HAVE_TERMIOS_H #include <termios.h> +#endif +#ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> +#endif #include "winerror.h" #include "winbase.h" Index: serial.c =================================================================== RCS file: /home/wine/wine/server/serial.c,v retrieving revision 1.25 diff -u -r1.25 serial.c --- serial.c 30 Jan 2003 00:26:44 -0000 1.25 +++ serial.c 31 Jan 2003 21:14:56 -0000 @@ -32,9 +32,15 @@ #include <sys/types.h> #include <time.h> #include <unistd.h> +#ifdef HAVE_UTIME_H #include <utime.h> +#endif +#ifdef HAVE_TERMIOS_H #include <termios.h> +#endif +#ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> +#endif #include "winerror.h" #include "winbase.h" Index: object.h =================================================================== RCS file: /home/wine/wine/server/object.h,v retrieving revision 1.48 diff -u -r1.48 object.h --- object.h 30 Jan 2003 00:26:44 -0000 1.48 +++ object.h 31 Jan 2003 19:16:57 -0000 @@ -21,7 +21,10 @@ #ifndef __WINE_SERVER_OBJECT_H #define __WINE_SERVER_OBJECT_H +#ifdef HAVE_SYS_POLL_H #include <sys/poll.h> +#endif + #include <sys/time.h> #include "wine/server_protocol.h" #include "list.h" Index: file.c =================================================================== RCS file: /home/wine/wine/server/file.c,v retrieving revision 1.60 diff -u -r1.60 file.c --- file.c 30 Jan 2003 00:26:44 -0000 1.60 +++ file.c 31 Jan 2003 19:22:34 -0000 @@ -35,7 +35,9 @@ #include <sys/types.h> #include <time.h> #include <unistd.h> +#ifdef HAVE_UTIME_H #include <utime.h> +#endif #include "winerror.h" #include "winbase.h" Index: named_pipe.c =================================================================== RCS file: /home/wine/wine/server/named_pipe.c,v retrieving revision 1.16 diff -u -r1.16 named_pipe.c --- named_pipe.c 30 Jan 2003 00:26:44 -0000 1.16 +++ named_pipe.c 31 Jan 2003 19:34:37 -0000 @@ -32,7 +32,9 @@ #include <stdlib.h> #include <sys/time.h> #include <sys/types.h> +#ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> +#endif #include <time.h> #include <unistd.h> Index: request.c =================================================================== RCS file: /home/wine/wine/server/request.c,v retrieving revision 1.71 diff -u -r1.71 request.c --- request.c 30 Jan 2003 00:26:44 -0000 1.71 +++ request.c 31 Jan 2003 19:43:54 -0000 @@ -24,7 +24,9 @@ #include <assert.h> #include <errno.h> #include <fcntl.h> +#ifdef HAVE_PWD_H #include <pwd.h> +#endif #include <signal.h> #include <stdio.h> #include <stdlib.h> @@ -39,8 +41,12 @@ #ifdef HAVE_SYS_WAIT_H # include <sys/wait.h> #endif +#ifdef HAVE_SYS_UIO_H #include <sys/uio.h> +#endif +#ifdef HAVE_SYS_UN_H #include <sys/un.h> +#endif #include <unistd.h> #include "windef.h" Index: select.c =================================================================== RCS file: /home/wine/wine/server/select.c,v retrieving revision 1.21 diff -u -r1.21 select.c --- select.c 30 Jan 2003 00:26:44 -0000 1.21 +++ select.c 31 Jan 2003 19:48:55 -0000 @@ -23,7 +23,9 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#ifdef HAVE_SYS_POLL_H #include <sys/poll.h> +#endif #include <sys/time.h> #include <sys/types.h> #include <unistd.h> Index: trace.c =================================================================== RCS file: /home/wine/wine/server/trace.c,v retrieving revision 1.151 diff -u -r1.151 trace.c --- trace.c 9 Jan 2003 06:01:32 -0000 1.151 +++ trace.c 3 Feb 2003 17:23:03 -0000 @@ -24,7 +24,11 @@ #include <ctype.h> #include <stdio.h> #include <sys/types.h> + +#ifdef HAVE_SYS_UIO_H #include <sys/uio.h> +#endif + #include "windef.h" #include "winbase.h" __________________________________________________ Do you Yahoo!? Yahoo! Mail Plus - Powerful. Affordable. Sign up now. http://mailplus.yahoo.com
