diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-07-17 06:51:26 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-07-17 06:51:47 +0100 |
| commit | 2e82ed9b7326cf8bf716efcdb600937b626a80b2 (patch) | |
| tree | d236da579a20ec6f1983abb30977b2114e76bd21 /sapi/phpdbg | |
| parent | 6cd140fdf8a276b27192288d4944f75aa7b81829 (diff) | |
| parent | 0db20a7cb1648420fbec2ea7895e4ac4bc68e634 (diff) | |
| download | php-git-2e82ed9b7326cf8bf716efcdb600937b626a80b2.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug 74913 redirecting incorrect include <sys/poll.h>
Diffstat (limited to 'sapi/phpdbg')
| -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 121f1edb17..c7ee88b616 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> |