From b10bcb4faa5655996afbc06f1be45fd460c159d9 Mon Sep 17 00:00:00 2001 From: Joe Watkins Date: Fri, 11 Jun 2021 09:33:55 +0200 Subject: [PATCH] fix bad refactor of #7136 --- ext/standard/basic_functions.stub.php | 2 +- ext/standard/net.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php index 5cfef05e5b3..431310d9592 100755 --- a/ext/standard/basic_functions.stub.php +++ b/ext/standard/basic_functions.stub.php @@ -429,7 +429,7 @@ function getmxrr(string $hostname, &$hosts, &$weights = null): bool {} /* net.c */ -#if defined(PHP_WIN32) || HAVE_GETIFADDRS +#if defined(PHP_WIN32) || HAVE_GETIFADDRS || defined(__PASE__) function net_get_interfaces(): array|false {} #endif diff --git a/ext/standard/net.c b/ext/standard/net.c index 5d470e3b2cd..943ccb8f060 100644 --- a/ext/standard/net.c +++ b/ext/standard/net.c @@ -33,7 +33,6 @@ #define getifaddrs Qp2getifaddrs #define freeifaddrs Qp2freeifaddrs #define ifaddrs ifaddrs_pase -#define HAVE_GETIFADDRS #endif #ifdef PHP_WIN32 @@ -103,7 +102,7 @@ PHPAPI zend_string* php_inet_ntop(const struct sockaddr *addr) { return NULL; } -#if defined(PHP_WIN32) || HAVE_GETIFADDRS +#if defined(PHP_WIN32) || HAVE_GETIFADDRS || defined(__PASE__) static void iface_append_unicast(zval *unicast, zend_long flags, struct sockaddr *addr, struct sockaddr *netmask, struct sockaddr *broadcast, struct sockaddr *ptp) { @@ -265,7 +264,7 @@ PHP_FUNCTION(net_get_interfaces) { FREE(pAddresses); #undef MALLOC #undef FREE -#elif HAVE_GETIFADDRS /* !PHP_WIN32 */ +#elif HAVE_GETIFADDRS || defined(__PASE__) /* !PHP_WIN32 */ struct ifaddrs *addrs = NULL, *p; ZEND_PARSE_PARAMETERS_NONE();