configure.ac: Detect sys/socket.h and update inclusion guards

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

configure.ac

@@ -100,7 +100,7 @@ AC_REPLACE_FUNCS([strlcpy])
 AC_REPLACE_FUNCS([strndup])
 AC_REPLACE_FUNCS([clock_gettime])
 
-AC_CHECK_HEADERS([bsd/string.h langinfo.h alloca.h sys/queue.h arpa/inet.h])
+AC_CHECK_HEADERS([bsd/string.h langinfo.h alloca.h sys/queue.h arpa/inet.h sys/socket.h])
 
 ## Configure random device path
 AC_ARG_WITH([urandom], 

src/netbios_ns.c

@@ -52,7 +52,8 @@
 #ifdef _WIN32
 # include <winsock2.h>
 # include <ws2tcpip.h>
-#else
+#endif
+#ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
 

src/netbios_session.c

@@ -39,9 +39,9 @@
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
-#ifndef _WIN32
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
-#else
+#endif
 
 #include "bdsm_debug.h"
 #include "netbios_session.h"