summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--sapi/phpdbg/phpdbg.c6
2 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index f9ae1cdf88..19dc26829b 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 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>