Fixed bug: #12443

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 95608f27b5874d96f9a1793d6ac2b51bc360aaf0..3b41d0acdf5fd9b945240bdb3d00375025a89ab8 100644 (file)
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -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 @@ int php_iconv_string(char *in_p, char **out, char *in_charset, char *out_charset
 
 /* {{{ 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;

diff --git a/ext/iconv/php_iconv.h b/ext/iconv/php_iconv.h
index f60097951baf290e57a1f5bf5b2348c1cb623e8e..74fead6ebbddd6b08f324249958b2d4613b7d96e 100644 (file)
--- a/ext/iconv/php_iconv.h
+++ b/ext/iconv/php_iconv.h
@@ -33,7 +33,7 @@ PHP_MINIT_FUNCTION(miconv);
 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);