archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Making PHP compile again on MacOSX 10.1

Browse source 
# 10.1 does not have inet_pton support yet it seems so disabling it.
This commit is contained in:
Dan Kalowsky 2001-12-27 15:42:05 +00:00
parent 3d89072c7e
commit b76eb3ae40
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ext/standard/dns.c
View file

@ -82,7 +82,9 @@ PHP_FUNCTION(gethostbyaddr)
addr = php_gethostbyaddr(Z_STRVAL_PP(arg)); addr = php_gethostbyaddr(Z_STRVAL_PP(arg));
if(addr == NULL) { if(addr == NULL) {
#if HAVE_IPV6 #if HAVE_IPV6 && !defined(__MacOSX__)
/* MacOSX at this time has support for IPv6, but not inet_pton()
* so disabling IPv6 until further notice. MacOSX 10.1.2 (kalowsky) */
php_error(E_WARNING, "Address is not a valid IPv4 or IPv6 address"); php_error(E_WARNING, "Address is not a valid IPv4 or IPv6 address");
#else #else
php_error(E_WARNING, "Address is not in a.b.c.d form"); php_error(E_WARNING, "Address is not in a.b.c.d form");
@ -98,13 +100,17 @@ PHP_FUNCTION(gethostbyaddr)
*/ */
static char *php_gethostbyaddr(char *ip) static char *php_gethostbyaddr(char *ip)
{ {
#if HAVE_IPV6 #if HAVE_IPV6 && !defined(__MacOSX__)
/* MacOSX at this time has support for IPv6, but not inet_pton()
* so disabling IPv6 until further notice. MacOSX 10.1.2 (kalowsky) */
struct in6_addr addr6; struct in6_addr addr6;
#endif #endif
struct in_addr addr; struct in_addr addr;
struct hostent *hp; struct hostent *hp;
#if HAVE_IPV6 #if HAVE_IPV6 && !defined(__MacOSX__)
/* MacOSX at this time has support for IPv6, but not inet_pton()
* so disabling IPv6 until further notice. MacOSX 10.1.2 (kalowsky) */
if (inet_pton(AF_INET6, ip, &addr6)) { if (inet_pton(AF_INET6, ip, &addr6)) {
hp = gethostbyaddr((char *) &addr6, sizeof(addr6), AF_INET6); hp = gethostbyaddr((char *) &addr6, sizeof(addr6), AF_INET6);
} else if (inet_pton(AF_INET, ip, &addr)) { } else if (inet_pton(AF_INET, ip, &addr)) {