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 502468b058..3c55f0ae0e 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ PHP NEWS
. Fixed #74866 (extension_dir = "./ext" now use current directory for base).
(Francois Laupretre)
. 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 f6008c22f1..5ef6b59d64 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>