mirror of
https://github.com/php/php-src.git
synced 2025-08-18 06:58:55 +02:00
Making PHP compile again on MacOSX 10.1
# 10.1 does not have inet_pton support yet it seems so disabling it.
This commit is contained in:
parent
3d89072c7e
commit
b76eb3ae40
1 changed files with 9 additions and 3 deletions
|
@ -82,7 +82,9 @@ PHP_FUNCTION(gethostbyaddr)
|
|||
addr = php_gethostbyaddr(Z_STRVAL_PP(arg));
|
||||
|
||||
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");
|
||||
#else
|
||||
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)
|
||||
{
|
||||
#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;
|
||||
#endif
|
||||
struct in_addr addr;
|
||||
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)) {
|
||||
hp = gethostbyaddr((char *) &addr6, sizeof(addr6), AF_INET6);
|
||||
} else if (inet_pton(AF_INET, ip, &addr)) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue