wez Sat Dec 6 05:32:36 2003 EDT
Modified files:
/php-src/main php_network.h
/php-src/win32/build config.w32
Log:
fix ipv6 stuff under vc6
Index: php-src/main/php_network.h
diff -u php-src/main/php_network.h:1.48 php-src/main/php_network.h:1.49
--- php-src/main/php_network.h:1.48 Fri Dec 5 19:00:31 2003
+++ php-src/main/php_network.h Sat Dec 6 05:32:35 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_network.h,v 1.48 2003/12/06 00:00:31 wez Exp $ */
+/* $Id: php_network.h,v 1.49 2003/12/06 10:32:35 wez Exp $ */
#ifndef _PHP_NETWORK_H
#define _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
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.11 php-src/win32/build/config.w32:1.12
--- php-src/win32/build/config.w32:1.11 Fri Dec 5 19:00:31 2003
+++ php-src/win32/build/config.w32 Sat Dec 6 05:32:35 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.11 2003/12/06 00:00:31 wez Exp $
+// $Id: config.w32,v 1.12 2003/12/06 10:32:35 wez Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -186,7 +186,7 @@
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");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
