MFB

diff --git a/main/network.c b/main/network.c
index 542312ce79f1cc47d3d2d9918a6de7d6aa833799..648a1c32a40d7ee80764b0558dfa602d90634b10 100644 (file)
--- a/main/network.c
+++ b/main/network.c
@@ -90,6 +90,9 @@ int inet_aton(const char *, struct in_addr *);
 # 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

diff --git a/main/php_network.h b/main/php_network.h
index 9414f6210b87743bfa264e50ea94efbb95a16a68..99392c691ff9141b853ddb17fe1295e4bf6d9c1d 100644 (file)
--- a/main/php_network.h
+++ b/main/php_network.h
@@ -121,12 +121,14 @@ typedef struct _php_pollfd {
 
 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