From: Rémi Denis-Courmont <rem@videolan.org>
Date: Thu, 24 Jan 2008 17:07:35 +0000 (+0000)
Subject: Remove the sys/socket.h check. We don't really use it anyway, and socket calls have... 
X-Git-Tag: 0.9.0-test0~3232
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=90d8682114f44b07051a5e1f24eab0039690cd33;p=vlc

Remove the sys/socket.h check. We don't really use it anyway, and socket calls have to be somewhere anyway
---

diff --git a/configure.ac b/configure.ac
index 39a9e17295..931414e809 100644
--- a/configure.ac
+++ b/configure.ac
@@ -790,12 +790,10 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[
 dnl Check for headers
 AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h stdbool.h getopt.h strings.h inttypes.h sys/int_types.h wchar.h locale.h)
 AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h)
-AC_CHECK_HEADERS([arpa/inet.h netinet/in.h sys/socket.h netinet/udplite.h])
+AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h])
 AC_CHECK_HEADERS([net/if.h], [], [],
   [
-    #if HAVE_SYS_SOCKET_H
-    # include <sys/socket.h>
-    #endif
+    #include <sys/socket.h>
   ])
 if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
 AC_CHECK_HEADERS(machine/param.h sys/shm.h)
diff --git a/include/vlc_network.h b/include/vlc_network.h
index e13a8ebda3..5e09fb2984 100644
--- a/include/vlc_network.h
+++ b/include/vlc_network.h
@@ -45,9 +45,7 @@ extern const char *net_strerror( int val );
 #       define IPV6_V6ONLY 27
 #   endif
 #else
-#   if HAVE_SYS_SOCKET_H
-#      include <sys/socket.h>
-#   endif
+#   include <sys/socket.h>
 #   if HAVE_NETINET_IN_H
 #      include <netinet/in.h>
 #   endif