php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix bad refactor of #7136

Browse Source
This commit is contained in:
Joe Watkins
2021-06-11 09:33:55 +02:00
parent ca6f3f62f2
commit b10bcb4faa
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/standard/basic_functions.stub.php
+1 -1
View File
@@ -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
ext/standard/net.c
+2 -3
View File
@@ -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();