diff options
| author | Jakub Zelenka <bukka@php.net> | 2017-04-30 20:27:39 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2017-04-30 20:27:39 +0100 |
| commit | 9622a3be436a300d45bf77524c2a75e628dca172 (patch) | |
| tree | 0b33b337bcb434438aab1cfb5adb6f7ea2c6457c /main/php_network.h | |
| parent | 6028fe511efd7e7f8444af9e53c4bbd7368233b1 (diff) | |
| parent | d9dfac90bf4bc71c7724fe3777542429a79a5f63 (diff) | |
| download | php-git-9622a3be436a300d45bf77524c2a75e628dca172.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'main/php_network.h')
| -rw-r--r-- | main/php_network.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/main/php_network.h b/main/php_network.h index b78f95400a..5385fe13d4 100644 --- a/main/php_network.h +++ b/main/php_network.h @@ -122,8 +122,12 @@ typedef int php_socket_t; /* uncomment this to debug poll(2) emulation on systems that have poll(2) */ /* #define PHP_USE_POLL_2_EMULATION 1 */ -#if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL) -# include <poll.h> +#if defined(HAVE_POLL) +# if defined(HAVE_POLL_H) +# include <poll.h> +# elif defined(HAVE_SYS_POLL_H) +# include <sys/poll.h> +# endif typedef struct pollfd php_pollfd; #else typedef struct _php_pollfd { |