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/network.c | |
| 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/network.c')
| -rw-r--r-- | main/network.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/network.c b/main/network.c index d0866708e9..8ce5fa0648 100644 --- a/main/network.c +++ b/main/network.c @@ -51,7 +51,9 @@ #ifdef HAVE_SYS_SELECT_H #include <sys/select.h> #endif -#if HAVE_SYS_POLL_H +#if HAVE_POLL_H +#include <poll.h> +#elif HAVE_SYS_POLL_H #include <sys/poll.h> #endif |