diff options
| author | Antony Dovgal <tony2001@php.net> | 2008-05-21 15:03:20 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2008-05-21 15:03:20 +0000 |
| commit | a894ab2a007a0324beaf583b80e30afef75bef3d (patch) | |
| tree | a86df3d087b3d36e637ae2e69e4f1c98e1d9c24d /ext/iconv | |
| parent | a41e990b07d043158bed67efb8f6c1e476ad40cb (diff) | |
| download | php-git-a894ab2a007a0324beaf583b80e30afef75bef3d.tar.gz | |
MFH
Diffstat (limited to 'ext/iconv')
| -rw-r--r-- | ext/iconv/iconv.c | 2 | ||||
| -rw-r--r-- | ext/iconv/php_iconv.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 95a50727ff..4f11d74d59 100644 --- 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 8f098b9ecd..1124eb6851 100644 --- 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 |