Index: ext/iconv/iconv.c
===================================================================
RCS file: /repository/php-src/ext/iconv/iconv.c,v
retrieving revision 1.124.2.8.2.20.2.6
diff -u -p -r1.124.2.8.2.20.2.6 iconv.c
--- ext/iconv/iconv.c	31 Dec 2007 07:17:09 -0000	1.124.2.8.2.20.2.6
+++ ext/iconv/iconv.c	21 May 2008 14:33:17 -0000
@@ -228,7 +228,7 @@ static php_iconv_err_t php_iconv_stream_
 /* }}} */
 
 /* {{{ 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
 /* }}} */
Index: ext/iconv/php_iconv.h
===================================================================
RCS file: /repository/php-src/ext/iconv/php_iconv.h,v
retrieving revision 1.28.2.2.2.2.2.3
diff -u -p -r1.28.2.2.2.2.2.3 php_iconv.h
--- ext/iconv/php_iconv.h	30 Jan 2008 09:41:12 -0000	1.28.2.2.2.2.2.3
+++ ext/iconv/php_iconv.h	21 May 2008 14:33:17 -0000
@@ -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