summaryrefslogtreecommitdiff
path: root/main/network.c
diff options
context:
space:
mode:
authorJakub Zelenka <bukka@php.net>2017-04-30 20:28:38 +0100
committerJakub Zelenka <bukka@php.net>2017-04-30 20:28:38 +0100
commit2bce80150fa5ec08f2ebfe20ec2732130fc058af (patch)
treeb2f22735726d36dfc98be423fa89aa3fbc9e821d /main/network.c
parentdccf487b2dcb395fd1e83ba98d8dc54bf7288c16 (diff)
parent9622a3be436a300d45bf77524c2a75e628dca172 (diff)
downloadphp-git-2bce80150fa5ec08f2ebfe20ec2732130fc058af.tar.gz
Merge branch 'PHP-7.1'
Diffstat (limited to 'main/network.c')
-rw-r--r--main/network.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/main/network.c b/main/network.c
index be9a6f198a..eee7d28fea 100644
--- a/main/network.c
+++ b/main/network.c
@@ -48,7 +48,9 @@
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif
-#if HAVE_SYS_POLL_H
+#if HAVE_POLL_H
+#include <poll.h>
+#elif HAVE_SYS_POLL_H
#include <sys/poll.h>
#endif