cvs: php4 /ext/iconv iconv.c php_iconv.h

sniper Sun Oct 21 22:28:00 2001 EDT Modified files: /php4/ext/iconv iconv.c php_iconv.h Log: Fixed bug: #12443 Index: php4/ext/iconv/iconv.c diff -u php4/ext/iconv/iconv.c:1.22 php4/ext/iconv/iconv.c:1.23 --- php4/ext/iconv/iconv.c:1.22 Thu Oct 11 19:32:52 2001 +++ php4/ext/iconv/iconv.c Sun Oct 21 22:28:00 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iconv.c,v 1.22 2001/10/11 23:32:52 ssb Exp $ */ +/* $Id: iconv.c,v 1.23 2001/10/22 02:28:00 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -51,7 +51,7 @@ /* {{{ iconv_functions[] */ function_entry iconv_functions[] = { - PHP_FE(iconv, NULL) + PHP_NAMED_FE(iconv,php_if_iconv, NULL) PHP_FE(ob_iconv_handler, NULL) PHP_FE(iconv_get_encoding, NULL) PHP_FE(iconv_set_encoding, NULL) @@ -163,7 +163,7 @@ /* {{{ proto string iconv(string in_charset, string out_charset, string str) Returns str converted to the out_charset character set */ -PHP_FUNCTION(iconv) +PHP_NAMED_FUNCTION(php_if_iconv) { zval **in_charset, **out_charset, **in_buffer; char *out_buffer; Index: php4/ext/iconv/php_iconv.h diff -u php4/ext/iconv/php_iconv.h:1.6 php4/ext/iconv/php_iconv.h:1.7 --- php4/ext/iconv/php_iconv.h:1.6 Sat Jul 28 07:35:53 2001 +++ php4/ext/iconv/php_iconv.h Sun Oct 21 22:28:00 2001 @@ -33,7 +33,7 @@ PHP_MSHUTDOWN_FUNCTION(miconv); PHP_MINFO_FUNCTION(miconv); -PHP_FUNCTION(iconv); +PHP_NAMED_FUNCTION(php_if_iconv); PHP_FUNCTION(ob_iconv_handler); PHP_FUNCTION(iconv_get_encoding); PHP_FUNCTION(iconv_set_encoding);