From 460360ae5363be1acce2a86aa0273a5913e01bdd Mon Sep 17 00:00:00 2001 From: Hannes Magnusson Date: Wed, 20 Dec 2006 10:38:24 +0000 Subject: [PATCH] MFB: - Fixed incorrect function names on FreeBSD where inet_pton() was named __inet_pton() and inet_ntop() was named __inet_ntop() - Fixed bug #39685 (iconv() - undefined function) - Fixed bug #38852 (XML-RPC Breaks iconv) --- Zend/zend_API.h | 3 +++ ext/iconv/iconv.c | 2 +- ext/standard/basic_functions.c | 4 ++-- main/php.h | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Zend/zend_API.h b/Zend/zend_API.h index dcad498633..87f52c9a31 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -48,6 +48,9 @@ typedef struct _zend_function_entry { #define ZEND_FENTRY(zend_name, name, arg_info, flags) { #zend_name, name, arg_info, (zend_uint) (sizeof(arg_info)/sizeof(struct _zend_arg_info)-1), flags }, +#define ZEND_RAW_FENTRY(zend_name, name, arg_info, flags) { zend_name, name, arg_info, (zend_uint) (sizeof(arg_info)/sizeof(struct _zend_arg_info)-1), flags }, +#define ZEND_RAW_NAMED_FE(zend_name, name, arg_info) ZEND_RAW_FENTRY(#zend_name, name, arg_info, 0) + #define ZEND_NAMED_FE(zend_name, name, arg_info) ZEND_FENTRY(zend_name, name, arg_info, 0) #define ZEND_FE(name, arg_info) ZEND_FENTRY(name, ZEND_FN(name), arg_info, 0) #define ZEND_DEP_FE(name, arg_info) ZEND_FENTRY(name, ZEND_FN(name), arg_info, ZEND_ACC_DEPRECATED) diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 832d2dca76..9dd1881cfe 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -136,7 +136,7 @@ ZEND_END_ARG_INFO() /* {{{ iconv_functions[] */ zend_function_entry iconv_functions[] = { - PHP_NAMED_FE(iconv,php_if_iconv, arginfo_iconv) + PHP_RAW_NAMED_FE(iconv,php_if_iconv, arginfo_iconv) PHP_FE(iconv_get_encoding, arginfo_iconv_get_encoding) PHP_FE(iconv_set_encoding, arginfo_iconv_set_encoding) PHP_FE(iconv_strlen, arginfo_iconv_strlen) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index b97a610684..f29af4469d 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -3378,10 +3378,10 @@ zend_function_entry basic_functions[] = { PHP_FE(number_format, arginfo_number_format) PHP_FE(fmod, arginfo_fmod) #ifdef HAVE_INET_NTOP - PHP_NAMED_FE(inet_ntop, php_inet_ntop, arginfo_inet_ntop) + PHP_RAW_NAMED_FE(inet_ntop, php_inet_ntop, arginfo_inet_ntop) #endif #ifdef HAVE_INET_PTON - PHP_NAMED_FE(inet_pton, php_inet_pton, arginfo_inet_pton) + PHP_RAW_NAMED_FE(inet_pton, php_inet_pton, arginfo_inet_pton) #endif PHP_FE(ip2long, arginfo_ip2long) PHP_FE(long2ip, arginfo_long2ip) diff --git a/main/php.h b/main/php.h index 84bf8927a4..97049ead23 100644 --- a/main/php.h +++ b/main/php.h @@ -336,6 +336,7 @@ END_EXTERN_C() #define PHP_FUNCTION ZEND_FUNCTION #define PHP_METHOD ZEND_METHOD +#define PHP_RAW_NAMED_FE ZEND_RAW_NAMED_FE #define PHP_NAMED_FE ZEND_NAMED_FE #define PHP_FE ZEND_FE #define PHP_DEP_FE ZEND_DEP_FE -- 2.50.1