diff options
| author | Michael Heimpold <mhei@heimpold.de> | 2017-04-18 00:22:34 +0200 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2017-04-30 20:24:56 +0100 |
| commit | d9dfac90bf4bc71c7724fe3777542429a79a5f63 (patch) | |
| tree | 420aa1a702d9448aebe2b106a6c80269c05c9748 /main/php_network.h | |
| parent | a0b9554f94a47b32e9771b1be999e255ca6bacc7 (diff) | |
| download | php-git-d9dfac90bf4bc71c7724fe3777542429a79a5f63.tar.gz | |
Fix compiler warnings when compiled against musl libc
musl libc is complaining when <sys/poll.h> is used instead of <poll.h>
so change this.
This issue was reported for OpenWrt/LEDE where musl libc is the standard
C library instead of e.g. glibc, see the following link for the original PR:
https://github.com/openwrt/packages/pull/4263
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
--
v3: refined checks/fallback paths as suggested by @bukka
v2: rebased to resolve merge conflict in main/php_network.h
v1: initial PR
Diffstat (limited to 'main/php_network.h')
| -rw-r--r-- | main/php_network.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/main/php_network.h b/main/php_network.h index 39035bad3d..28a9ffd1b0 100644 --- a/main/php_network.h +++ b/main/php_network.h @@ -120,8 +120,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 { |