Sent on the 15th, got lost without a trace! ---------- Forwarded message ---------- Date: Thu, 15 Nov 2001 17:29:32 -0800 From: François Gouget <fgouget@codeweavers.com> To: wine-patches@winehq.com Subject: Solaris and FreeBSD compilation fixes This patch should fix the Solaris and FreeBSD compilation errors introduced by my recent winsock update. Changelog: François Gouget <fgouget@codeweavers.com> * dlls/wsock32/protocol.c, dlls/wsock32/socket.c, server/trace.c Fix the Solaris and FreeBSD compilation errors introduced by the recent winsock update -- François Gouget fgouget@codeweavers.com
Index: dlls/wsock32/protocol.c =================================================================== RCS file: /home/wine/wine/dlls/wsock32/protocol.c,v retrieving revision 1.7 diff -u -r1.7 protocol.c --- dlls/wsock32/protocol.c 2001/11/14 21:26:23 1.7 +++ dlls/wsock32/protocol.c 2001/11/15 23:14:30 @@ -11,12 +11,22 @@ #include "config.h" -#include <arpa/inet.h> -#include <netdb.h> -#include <netinet/in.h> #include <stdio.h> #include <string.h> + +#include <sys/types.h> +#ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> +#endif +#ifdef HAVE_NETINET_IN_H +# include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif +#ifdef HAVE_NETDB_H +#include <netdb.h> +#endif #include "winbase.h" #include "winnls.h" Index: dlls/wsock32/socket.c =================================================================== RCS file: /home/wine/wine/dlls/wsock32/socket.c,v retrieving revision 1.16 diff -u -r1.16 socket.c --- dlls/wsock32/socket.c 2001/11/14 21:26:23 1.16 +++ dlls/wsock32/socket.c 2001/11/15 23:14:31 @@ -28,28 +28,33 @@ #include "config.h" +#include <errno.h> #include <string.h> -#include <sys/types.h> -#include "windef.h" -#include "winbase.h" -#include "debugtools.h" -#include "winsock2.h" -#include "winnt.h" -#include "wscontrol.h" #include <ctype.h> #include <fcntl.h> -#include <sys/ioctl.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> +#include <sys/ioctl.h> + +#include <sys/types.h> +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif #ifdef HAVE_SYS_SOCKIO_H # include <sys/sockio.h> #endif #ifdef HAVE_NET_IF_H # include <net/if.h> #endif -#include <errno.h> +#include "windef.h" +#include "winbase.h" +#include "debugtools.h" +#include "winsock2.h" +#include "winnt.h" +#include "wscontrol.h" + #ifdef __NetBSD__ #undef if_type #endif Index: server/trace.c =================================================================== RCS file: /home/wine/wine/server/trace.c,v retrieving revision 1.114 diff -u -r1.114 trace.c --- server/trace.c 2001/11/13 22:23:48 1.114 +++ server/trace.c 2001/11/15 23:14:55 @@ -11,7 +11,6 @@ #include <sys/types.h> #include <sys/uio.h> -#include "winsock2.h" #include "winnt.h" #include "winbase.h" #include "wincon.h"
