diff options
| author | Sara Golemon <pollita@php.net> | 2004-08-07 15:59:59 +0000 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2004-08-07 15:59:59 +0000 |
| commit | 37b8c079d6c7d08b6d8e6e4a83cbf583a1b02a95 (patch) | |
| tree | 1a75a14208df8f55ac2c464170ca19393a41f388 | |
| parent | 592b17d4d18c397c1460ac34cfe96f2cb84013b8 (diff) | |
| download | php-git-37b8c079d6c7d08b6d8e6e4a83cbf583a1b02a95.tar.gz | |
Fix inet_pton/ntop() on BSD
| -rw-r--r-- | ext/standard/basic_functions.c | 8 | ||||
| -rw-r--r-- | ext/standard/basic_functions.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index ada028fd7c..09b971ef01 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -420,10 +420,10 @@ function_entry basic_functions[] = { PHP_FE(number_format, NULL) PHP_FE(fmod, NULL) #ifdef HAVE_INET_NTOP - PHP_FE(inet_ntop, NULL) + PHP_NAMED_FE(inet_ntop, php_inet_ntop, NULL) #endif #ifdef HAVE_INET_PTON - PHP_FE(inet_pton, NULL) + PHP_NAMED_FE(inet_pton, php_inet_pton, NULL) #endif PHP_FE(ip2long, NULL) PHP_FE(long2ip, NULL) @@ -1282,7 +1282,7 @@ PHP_FUNCTION(constant) #ifdef HAVE_INET_NTOP /* {{{ proto string inet_ntop(string in_addr) Converts a packed inet address to a human readable IP address string */ -PHP_FUNCTION(inet_ntop) +PHP_NAMED_FUNCTION(php_inet_ntop) { char *address; int address_len, af = AF_INET; @@ -1315,7 +1315,7 @@ PHP_FUNCTION(inet_ntop) #ifdef HAVE_INET_PTON /* {{{ proto string inet_pton(string ip_address) Converts a human readable IP address to a packed binary string */ -PHP_FUNCTION(inet_pton) +PHP_NAMED_FUNCTION(php_inet_pton) { int ret, af = AF_INET; char *address; diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h index ead825bfe2..a41ae5099f 100644 --- a/ext/standard/basic_functions.h +++ b/ext/standard/basic_functions.h @@ -53,10 +53,10 @@ PHP_FUNCTION(time_nanosleep); #endif PHP_FUNCTION(flush); #ifdef HAVE_INET_NTOP -PHP_FUNCTION(inet_ntop); +PHP_NAMED_FUNCTION(php_inet_ntop); #endif #ifdef HAVE_INET_PTON -PHP_FUNCTION(inet_pton); +PHP_NAMED_FUNCTION(php_inet_pton); #endif PHP_FUNCTION(ip2long); PHP_FUNCTION(long2ip); |