diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-07-17 06:52:00 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-07-17 06:52:43 +0100 |
| commit | 8c238c15bcd0ecea2971ae2ca3a286b485419640 (patch) | |
| tree | d188aee17f2489379698b12bef164f5bbb3ea790 /sapi/phpdbg/phpdbg.c | |
| parent | ea51bcd1faa87222c827d679ea3723b2e9b10288 (diff) | |
| parent | 2e82ed9b7326cf8bf716efcdb600937b626a80b2 (diff) | |
| download | php-git-8c238c15bcd0ecea2971ae2ca3a286b485419640.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug 74913 redirecting incorrect include <sys/poll.h>
Diffstat (limited to 'sapi/phpdbg/phpdbg.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index f6008c22f1..5ef6b59d64 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -39,7 +39,11 @@ # include <sys/select.h> # include <sys/time.h> # include <sys/types.h> -# include <sys/poll.h> +# if HAVE_POLL_H +# include <poll.h> +# elif HAVE_SYS_POLL_H +# include <sys/poll.h> +# endif # include <netinet/in.h> # include <unistd.h> # include <arpa/inet.h> |