php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.0' into PHP-7.1

Browse Source
This commit is contained in:
Jakub Zelenka
2017-04-30 20:27:39 +01:00
parent 6028fe511e d9dfac90bf
commit 9622a3be43
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/php_network.h
View File

@@ -122,8 +122,12 @@ typedef int php_socket_t;
/* uncomment this to debug poll(2) emulation on systems that have poll(2) */
/* #define PHP_USE_POLL_2_EMULATION 1 */
#if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL)
# include <poll.h>
#if defined(HAVE_POLL)
# if defined(HAVE_POLL_H)
# include <poll.h>
# elif defined(HAVE_SYS_POLL_H)
# include <sys/poll.h>
# endif
typedef struct pollfd php_pollfd;
#else
typedef struct _php_pollfd {