MFH

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 95a50727ff6e8d2f7e76fde3d441b2ced36312a1..4f11d74d5914ea5bc9bef91edb957f21499b7c0b 100644 (file)
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -228,7 +228,7 @@ static php_iconv_err_t php_iconv_stream_filter_unregister_factory(TSRMLS_D);
 /* }}} */
 
 /* {{{ static globals */
-static char _generic_superset_name[] = "UCS-4LE";
+static char _generic_superset_name[] = ICONV_UCS4_ENCODING;
 #define GENERIC_SUPERSET_NAME _generic_superset_name
 #define GENERIC_SUPERSET_NBYTES 4
 /* }}} */

diff --git a/ext/iconv/php_iconv.h b/ext/iconv/php_iconv.h
index 8f098b9ecd03e7bb4b173e7942ee90eb1f3ce23a..1124eb68519e596bb08dcf196423b6301eb0c8a8 100644 (file)
--- a/ext/iconv/php_iconv.h
+++ b/ext/iconv/php_iconv.h
@@ -83,11 +83,13 @@ ZEND_END_MODULE_GLOBALS(iconv)
 # define ICONV_OUTPUT_ENCODING "ISO8859-1"
 # define ICONV_INTERNAL_ENCODING "ISO8859-1"
 # define ICONV_ASCII_ENCODING "IBM-850"
+# define ICONV_UCS4_ENCODING "UCS-4"
 #else
 # define ICONV_INPUT_ENCODING "ISO-8859-1"
 # define ICONV_OUTPUT_ENCODING "ISO-8859-1"
 # define ICONV_INTERNAL_ENCODING "ISO-8859-1"
 # define ICONV_ASCII_ENCODING "ASCII"
+# define ICONV_UCS4_ENCODING "UCS-4LE"
 #endif
 
 #ifndef ICONV_CSNMAXLEN