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/fastcgi.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/fastcgi.c')
-rw-r--r-- | main/fastcgi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/fastcgi.c b/main/fastcgi.c index cca4342f2a..1e8a8064d7 100644 --- a/main/fastcgi.c +++ b/main/fastcgi.c @@ -76,7 +76,9 @@ static int is_impersonate = 0; # include <netdb.h> # include <signal.h> -# if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL) +# if defined(HAVE_POLL_H) && defined(HAVE_POLL) +# include <poll.h> +# elif defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL) # include <sys/poll.h> # endif # if defined(HAVE_SYS_SELECT_H) @@ -1430,7 +1432,7 @@ int fcgi_accept_request(fcgi_request *req) break; #else if (req->fd >= 0) { -#if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL) +#if defined(HAVE_POLL) struct pollfd fds; int ret; |