From 6d57740818ef2fda408bf6fd86c2e7831f57389c Mon Sep 17 00:00:00 2001 From: Sara Golemon Date: Mon, 27 Nov 2017 12:47:26 -0500 Subject: [PATCH] Bugfix net_get_interfaces() on NetBSD --- ext/standard/net.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ext/standard/net.c b/ext/standard/net.c index f8d06e04cd..2aee77ed6e 100644 --- a/ext/standard/net.c +++ b/ext/standard/net.c @@ -29,7 +29,6 @@ #if HAVE_GETIFADDRS # include -# include #endif #ifdef PHP_WIN32 @@ -38,6 +37,8 @@ # include # include # include +#else +# include #endif PHPAPI zend_string* php_inet_ntop(const struct sockaddr *addr) { @@ -95,6 +96,7 @@ PHPAPI zend_string* php_inet_ntop(const struct sockaddr *addr) { return NULL; } +#if defined(PHP_WIN32) || HAVE_GETIFADDRS static void iface_append_unicast(zval *unicast, zend_long flags, struct sockaddr *addr, struct sockaddr *netmask, struct sockaddr *broadcast, struct sockaddr *ptp) { @@ -124,6 +126,7 @@ static void iface_append_unicast(zval *unicast, zend_long flags, add_next_index_zval(unicast, &u); } +#endif /* {{{ proto array|false net_get_interfaces() Returns an array in the form: -- 2.50.1