tony2001 Wed May 21 15:03:20 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/iconv iconv.c php_iconv.h
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/iconv.c?r1=1.124.2.8.2.20.2.6&r2=1.124.2.8.2.20.2.7&diff_format=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.124.2.8.2.20.2.6
php-src/ext/iconv/iconv.c:1.124.2.8.2.20.2.7
--- php-src/ext/iconv/iconv.c:1.124.2.8.2.20.2.6 Mon Dec 31 07:17:09 2007
+++ php-src/ext/iconv/iconv.c Wed May 21 15:03:20 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.124.2.8.2.20.2.6 2007/12/31 07:17:09 sebastian Exp $ */
+/* $Id: iconv.c,v 1.124.2.8.2.20.2.7 2008/05/21 15:03:20 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -228,7 +228,7 @@
/* }}} */
/* {{{ 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
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/php_iconv.h?r1=1.28.2.2.2.2.2.3&r2=1.28.2.2.2.2.2.4&diff_format=u
Index: php-src/ext/iconv/php_iconv.h
diff -u php-src/ext/iconv/php_iconv.h:1.28.2.2.2.2.2.3
php-src/ext/iconv/php_iconv.h:1.28.2.2.2.2.2.4
--- php-src/ext/iconv/php_iconv.h:1.28.2.2.2.2.2.3 Wed Jan 30 09:41:12 2008
+++ php-src/ext/iconv/php_iconv.h Wed May 21 15:03:20 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Revision: 1.28.2.2.2.2.2.3 $ */
+/* $Revision: 1.28.2.2.2.2.2.4 $ */
#ifndef PHP_ICONV_H
#define PHP_ICONV_H
@@ -83,11 +83,13 @@
# 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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
