Add HAVE_*_H checks around inclusions of netinet/in.h and sys/socket.h

Only include <netinet/in.h> and <sys/socket.h> if the system supplies them.
This is necessary to try and get the mingw32 build working again.

No need to include <sys/types.h> and <netinet/in.h> from cdns.c - these are
already included by <irc.h>.

include/irc.h

@@ -60,8 +60,13 @@ extern char	thing_star[4];
 #  include <gtk/gtkmenu.h>
 #endif
 
+#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>

include/irc_std.h

@@ -37,7 +37,9 @@
 /*
  * Everybody needs these INET headers...
  */
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif

include/struct.h

@@ -19,7 +19,9 @@
 #include "hash.h"
 #include "config.h"
 #include "ssl.h"
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 
 /*
  * struct sockaddr_storage isn't avaiable on all ipv6-ready-systems, bleh ;(

source/cdns.c

@@ -21,9 +21,6 @@
  * $Id$
  */
 
-#include <sys/types.h>
-#include <netinet/in.h>
-
 #include "cdns.h"
 #include "irc.h"	/* To pick up our next #define checks */
 static char cvsrevision[] = "$Id$";