Merge branch 'PHP-7.1'

* PHP-7.1:
  Update php_network.h
This commit is contained in:
Joe Watkins 2017-04-20 06:39:37 +01:00
commit 010ccadf44
No known key found for this signature in database
GPG key ID: F9BA0ADA31CBD89E

View file

@ -123,7 +123,7 @@ typedef int php_socket_t;
/* #define PHP_USE_POLL_2_EMULATION 1 */
#if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL)
# include <sys/poll.h>
# include <poll.h>
typedef struct pollfd php_pollfd;
#else
typedef struct _php_pollfd {