tony2001                Wed May 21 15:03:12 2008 UTC

  Modified files:              
    /php-src/ext/iconv  iconv.c php_iconv.h 
  Log:
  use macros instead of hardcoded encoding names
  ([EMAIL PROTECTED] AIX is totally broken..)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/iconv.c?r1=1.164&r2=1.165&diff_format=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.164 php-src/ext/iconv/iconv.c:1.165
--- php-src/ext/iconv/iconv.c:1.164     Mon Jan 21 07:30:49 2008
+++ php-src/ext/iconv/iconv.c   Wed May 21 15:03:11 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: iconv.c,v 1.164 2008/01/21 07:30:49 pollita Exp $ */
+/* $Id: iconv.c,v 1.165 2008/05/21 15:03:11 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -225,7 +225,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.36&r2=1.37&diff_format=u
Index: php-src/ext/iconv/php_iconv.h
diff -u php-src/ext/iconv/php_iconv.h:1.36 php-src/ext/iconv/php_iconv.h:1.37
--- php-src/ext/iconv/php_iconv.h:1.36  Wed Jan 30 09:56:21 2008
+++ php-src/ext/iconv/php_iconv.h       Wed May 21 15:03:11 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Revision: 1.36 $ */
+/* $Revision: 1.37 $ */
 
 #ifndef PHP_ICONV_H
 #define PHP_ICONV_H
@@ -82,11 +82,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

Reply via email to