diff options
| author | Moriyoshi Koizumi <moriyoshi@php.net> | 2004-02-28 20:45:27 +0000 |
|---|---|---|
| committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2004-02-28 20:45:27 +0000 |
| commit | 11b0f469f00bf2b80d453dbff1aa274db5dfb500 (patch) | |
| tree | fbc96b4e6eb411882b08562a437affe28e07a741 /ext/mbstring/mbstring.c | |
| parent | dc03dbc699eced5eb067662447f8007df5562255 (diff) | |
| download | php-git-11b0f469f00bf2b80d453dbff1aa274db5dfb500.tar.gz | |
- Upgrade bundled oniguruma regex library to 2.2.2 (Rui, Moriyoshi)
. Supports various encodings such as BIG5, GB2312 and ISO-8859-*
. Fixes bug #26677 (mbstring compile errors with IRIX)
. Many thanks to K.Kosako.
- Remove redundant files that are not relevant to the build.
Diffstat (limited to 'ext/mbstring/mbstring.c')
| -rw-r--r-- | ext/mbstring/mbstring.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 2a1944db83..d0fb5db869 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -610,10 +610,10 @@ static PHP_INI_MH(OnUpdate_mbstring_internal_encoding) MBSTRG(current_internal_encoding) = no_encoding; #if HAVE_MBREGEX { - php_mb_reg_char_encoding mbctype; + OnigEncoding mbctype; mbctype = php_mb_regex_name2mbctype(new_value); - if (mbctype == REGCODE_UNDEF) { - mbctype = REGCODE_EUCJP; + if (mbctype == ONIG_ENCODING_UNDEF) { + mbctype = ONIG_ENCODING_EUC_JP; } MBSTRG(current_mbctype) = MBSTRG(default_mbctype) = mbctype; } @@ -995,7 +995,7 @@ PHP_MINFO_FUNCTION(mbstring) php_info_print_table_end(); php_info_print_table_start(); - php_info_print_table_colspan_header(2, "mbstring extension makes use of \"streamable kanji code filter and converter\", which is distributed under the GNU Lesser General Public License version 2.1."); + php_info_print_table_header(1, "mbstring extension makes use of \"streamable kanji code filter and converter\", which is distributed under the GNU Lesser General Public License version 2.1."); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); |