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 | |
| 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>
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 6 |
2 files changed, 6 insertions, 1 deletions
@@ -10,6 +10,7 @@ PHP NEWS . Fixed bug #74761 (Unary operator expected error on some systems). (petk) . Fixed bug #73900 (Use After Free in unserialize() SplFixedArray). (nikic) . Fixed bug #74923 (Crash when crawling through network share). (Anatol) + . Fixed bug #74913 (fixed incorrect poll.h include). (petk) - Date: . Fixed bug #74852 (property_exists returns true on unknown DateInterval 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> |