From: Steve Lhomme <robux@videolan.org>
Date: Sat, 1 Oct 2005 09:58:52 +0000 (+0000)
Subject: avoid declaration collision on MSVC
X-Git-Tag: 0.8.4~374
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=4b6fe28ab6f1457cc248c5b12d9e669fab2afe59

avoid declaration collision on MSVC
---

diff --git a/modules/misc/network/ipv4.c b/modules/misc/network/ipv4.c
index 43a52b48bf..bca68832ff 100644
--- a/modules/misc/network/ipv4.c
+++ b/modules/misc/network/ipv4.c
@@ -54,7 +54,9 @@
 #   include <winsock2.h>
 #   include <ws2tcpip.h>
 #   include <iphlpapi.h>
-#   define close closesocket
+#   if !defined(INCL_WINSOCK_API_PROTOTYPES)
+#       define close closesocket
+#   endif
 #   if defined(UNDER_CE)
 #       undef IP_MULTICAST_TTL
 #       define IP_MULTICAST_TTL 3