fix ipv6 stuff under vc6

diff --git a/main/php_network.h b/main/php_network.h
index a694198df9281bdba3629cb506eb0d37714e7355..6205a1a2dc78b17d1129fb58b8f6bb22f51fe2a3 100644 (file)
--- a/main/php_network.h
+++ b/main/php_network.h
@@ -27,11 +27,11 @@
 # endif
 # undef FD_SETSIZE
 # include "arpa/inet.h"
-# if HAVE_WS2TCPIP_H
-   /* IPv6 stuff, also defines socklen_t */
-#  include <ws2tcpip.h>
-# else
-typedef unsigned int socklen_t;
+/* defines socklen_t and some IPV6 stuff */
+# include <ws2tcpip.h>
+# if HAVE_WSPIAPI_H
+   /* getaddrinfo */
+#  include <wspiapi.h>
 # endif
 #else
 # undef closesocket

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 11dca8cc1c1d2b7592a7d02d00fc61d5a14fd35d..15a63ed74bd20ed7ea9f5c403c8217e23d5b3bb7 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -186,7 +186,7 @@ ARG_ENABLE("ipv6", "Disable IPv6 support (default is turn it on if available)",
 
 var main_network_has_ipv6 = 0;
 if (PHP_IPV6 == "yes") {
-       main_network_has_ipv6 = CHECK_HEADER_ADD_INCLUDE("ws2tcpip.h", "CFLAGS") ? 1 : 0;
+       main_network_has_ipv6 = CHECK_HEADER_ADD_INCLUDE("wspiapi.h", "CFLAGS") ? 1 : 0;
 }
 if (main_network_has_ipv6) {
        STDOUT.WriteLine("Enabling IPv6 support");