diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2017-07-12 21:23:41 +0200 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-07-17 06:50:59 +0100 |
| commit | 0db20a7cb1648420fbec2ea7895e4ac4bc68e634 (patch) | |
| tree | b46c9ed0dd666e8c3712eb4a1a6a3e7c78a96d6e | |
| parent | c1504b81d35da5630cab32d57f4d3faa0bf3aaa1 (diff) | |
| download | php-git-0db20a7cb1648420fbec2ea7895e4ac4bc68e634.tar.gz | |
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
@@ -9,6 +9,7 @@ PHP NEWS (jhdxr) . Fixed bug #74761 (Unary operator expected error on some systems). (petk) . Fixed bug #73900 (Use After Free in unserialize() SplFixedArray). (nikic) + . 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 c4078856d6..5fbc0d8126 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -43,7 +43,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> |