Fix inet_pton/ntop() on BSD

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index ada028fd7ca297c8113d34e6b5f86b89aa1368aa..09b971ef0180abb6867e07e0528c801dcd18bcde 100644 (file)
--- 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 ead825bfe20bf86014447c1bc409e3a3a54b3959..a41ae5099f30f4eddc32e542164c4de9ba2c0080 100644 (file)
--- 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);