Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug 74913 redirecting incorrect include <sys/poll.h>

Author: krakjoe

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 

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>