diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-04-20 06:39:26 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-04-20 06:39:26 +0100 |
| commit | 242bdf7e8bdaf3a64ec9e5eab244cae9e2d3e074 (patch) | |
| tree | 883edbeef49b0dde309c66a44db4b69016b52af7 /main/php_network.h | |
| parent | 0a27a5ba8ce17aae3957c0efa223a82e4d6e41cf (diff) | |
| parent | 464742bd2a9ce765d8b0be4ba6897c3e5accd6fe (diff) | |
| download | php-git-242bdf7e8bdaf3a64ec9e5eab244cae9e2d3e074.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Update php_network.h
Diffstat (limited to 'main/php_network.h')
| -rw-r--r-- | main/php_network.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/php_network.h b/main/php_network.h index 62e97b18cb..b78f95400a 100644 --- a/main/php_network.h +++ b/main/php_network.h @@ -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 { |