auroraeosrose Tue Oct 9 21:53:44 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/main network.c php_network.h Log: Fix build on MSVC 2008 - channeling Wez http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.6&r2=1.118.2.2.2.6.2.1&diff_format=u Index: php-src/main/network.c diff -u php-src/main/network.c:1.118.2.2.2.6 php-src/main/network.c:1.118.2.2.2.6.2.1 --- php-src/main/network.c:1.118.2.2.2.6 Wed Jul 18 09:04:58 2007 +++ php-src/main/network.c Tue Oct 9 21:53:44 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: network.c,v 1.118.2.2.2.6 2007/07/18 09:04:58 jani Exp $ */ +/* $Id: network.c,v 1.118.2.2.2.6.2.1 2007/10/09 21:53:44 auroraeosrose Exp $ */ /*#define DEBUG_MAIN_NETWORK 1*/ @@ -90,6 +90,9 @@ # define SOCK_ERR INVALID_SOCKET # define SOCK_CONN_ERR SOCKET_ERROR # define PHP_TIMEOUT_ERROR_VALUE WSAETIMEDOUT + +struct in6_addr in6addr_any = {0}; /* IN6ADDR_ANY_INIT; */ + #else # define SOCK_ERR -1 # define SOCK_CONN_ERR -1 http://cvs.php.net/viewvc.cgi/php-src/main/php_network.h?r1=1.56.2.1.2.1&r2=1.56.2.1.2.1.2.1&diff_format=u Index: php-src/main/php_network.h diff -u php-src/main/php_network.h:1.56.2.1.2.1 php-src/main/php_network.h:1.56.2.1.2.1.2.1 --- php-src/main/php_network.h:1.56.2.1.2.1 Mon Jan 1 09:36:11 2007 +++ php-src/main/php_network.h Tue Oct 9 21:53:44 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_network.h,v 1.56.2.1.2.1 2007/01/01 09:36:11 sebastian Exp $ */ +/* $Id: php_network.h,v 1.56.2.1.2.1.2.1 2007/10/09 21:53:44 auroraeosrose Exp $ */ #ifndef _PHP_NETWORK_H #define _PHP_NETWORK_H @@ -121,12 +121,14 @@ PHPAPI int php_poll2(php_pollfd *ufds, unsigned int nfds, int timeout); +#ifndef POLLIN # define POLLIN 0x0001 /* There is data to read */ # define POLLPRI 0x0002 /* There is urgent data to read */ # define POLLOUT 0x0004 /* Writing now will not block */ # define POLLERR 0x0008 /* Error condition */ # define POLLHUP 0x0010 /* Hung up */ # define POLLNVAL 0x0020 /* Invalid request: fd not open */ +#endif # ifndef PHP_USE_POLL_2_EMULATION # define PHP_USE_POLL_2_EMULATION 1
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php