com php-src: Fixed bug 74913 redirecting incorrect include <sys/poll.h>: NEWS sapi/phpdbg/phpdbg.c

Commit: 0db20a7cb1648420fbec2ea7895e4ac4bc68e634 Author: Peter Kokot <peterkokot@gmail.com> Wed, 12 Jul 2017 21:23:41 +0200 Committer: Joe Watkins <krakjoe@php.net> Mon, 17 Jul 2017 06:50:59 +0100 Parents: c1504b81d35da5630cab32d57f4d3faa0bf3aaa1 Branches: PHP-7.0 PHP-7..1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0db20a7cb1648420fbec2ea7895e4ac4bc68e634 Log: Fixed bug 74913 redirecting incorrect include <sys/poll.h> Bugs: https://bugs.php.net/74913 Changed paths: M NEWS M sapi/phpdbg/phpdbg.c Diff: diff --git a/NEWS b/NEWS index f9ae1cd..19dc268 100644 --- a/NEWS +++ b/NEWS @@ -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 c407885..5fbc0d8 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>