cvs: php-src /ext/standard basic_functions.c basic_functions.h

pollita Sat Aug 7 12:00:00 2004 EDT Modified files: /php-src/ext/standard basic_functions.c basic_functions.h Log: Fix inet_pton/ntop() on BSD http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.681&r2=1.682&ty=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.681 php-src/ext/standard/basic_functions.c:1.682 --- php-src/ext/standard/basic_functions.c:1.681 Sat Aug 7 01:11:26 2004 +++ php-src/ext/standard/basic_functions.c Sat Aug 7 11:59:59 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.681 2004/08/07 05:11:26 pollita Exp $ */ +/* $Id: basic_functions.c,v 1.682 2004/08/07 15:59:59 pollita Exp $ */ #include "php.h" #include "php_streams.h" @@ -420,10 +420,10 @@ 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 @@ #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 @@ #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; http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.h?r1=1.134&r2=1.135&ty=u Index: php-src/ext/standard/basic_functions.h diff -u php-src/ext/standard/basic_functions.h:1.134 php-src/ext/standard/basic_functions.h:1.135 --- php-src/ext/standard/basic_functions.h:1.134 Sat Aug 7 00:50:24 2004 +++ php-src/ext/standard/basic_functions.h Sat Aug 7 11:59:59 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.h,v 1.134 2004/08/07 04:50:24 pollita Exp $ */ +/* $Id: basic_functions.h,v 1.135 2004/08/07 15:59:59 pollita Exp $ */ #ifndef BASIC_FUNCTIONS_H #define BASIC_FUNCTIONS_H @@ -53,10 +53,10 @@ #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);