diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-06-30 09:20:06 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-06-30 18:43:40 +0200 |
| commit | 3516a9c8f096a71f493b90fb6b2be3ee3b0f0293 (patch) | |
| tree | eee25c9aef4118e15da05a2a4f62bdadf2adde38 /ext/mbstring/php_mbregex.c | |
| parent | 89b2483edd0be53ef13cbd9e80cd15198f31f2c3 (diff) | |
| download | php-git-3516a9c8f096a71f493b90fb6b2be3ee3b0f0293.tar.gz | |
Replace ISO_8859-* with ISO8859-* aliases for MBString
We also remove the mbregex ISO 8859 aliases with underscores.
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
| -rw-r--r-- | ext/mbstring/php_mbregex.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index c614b0d5a4..b3c37826b1 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -276,91 +276,91 @@ static const php_mb_regex_enc_name_map_t enc_name_map[] = { #endif #ifdef ONIG_ENCODING_ISO_8859_1 { - "ISO-8859-1\0ISO8859-1\0ISO_8859_1\0ISO8859_1\0", + "ISO-8859-1\0ISO8859-1\0", ONIG_ENCODING_ISO_8859_1 }, #endif #ifdef ONIG_ENCODING_ISO_8859_2 { - "ISO-8859-2\0ISO8859-2\0ISO_8859_2\0ISO8859_2\0", + "ISO-8859-2\0ISO8859-2\0", ONIG_ENCODING_ISO_8859_2 }, #endif #ifdef ONIG_ENCODING_ISO_8859_3 { - "ISO-8859-3\0ISO8859-3\0ISO_8859_3\0ISO8859_3\0", + "ISO-8859-3\0ISO8859-3\0", ONIG_ENCODING_ISO_8859_3 }, #endif #ifdef ONIG_ENCODING_ISO_8859_4 { - "ISO-8859-4\0ISO8859-4\0ISO_8859_4\0ISO8859_4\0", + "ISO-8859-4\0ISO8859-4\0", ONIG_ENCODING_ISO_8859_4 }, #endif #ifdef ONIG_ENCODING_ISO_8859_5 { - "ISO-8859-5\0ISO8859-5\0ISO_8859_5\0ISO8859_5\0", + "ISO-8859-5\0ISO8859-5\0", ONIG_ENCODING_ISO_8859_5 }, #endif #ifdef ONIG_ENCODING_ISO_8859_6 { - "ISO-8859-6\0ISO8859-6\0ISO_8859_6\0ISO8859_6\0", + "ISO-8859-6\0ISO8859-6\0", ONIG_ENCODING_ISO_8859_6 }, #endif #ifdef ONIG_ENCODING_ISO_8859_7 { - "ISO-8859-7\0ISO8859-7\0ISO_8859_7\0ISO8859_7\0", + "ISO-8859-7\0ISO8859-7\0", ONIG_ENCODING_ISO_8859_7 }, #endif #ifdef ONIG_ENCODING_ISO_8859_8 { - "ISO-8859-8\0ISO8859-8\0ISO_8859_8\0ISO8859_8\0", + "ISO-8859-8\0ISO8859-8\0", ONIG_ENCODING_ISO_8859_8 }, #endif #ifdef ONIG_ENCODING_ISO_8859_9 { - "ISO-8859-9\0ISO8859-9\0ISO_8859_9\0ISO8859_9\0", + "ISO-8859-9\0ISO8859-9\0", ONIG_ENCODING_ISO_8859_9 }, #endif #ifdef ONIG_ENCODING_ISO_8859_10 { - "ISO-8859-10\0ISO8859-10\0ISO_8859_10\0ISO8859_10\0", + "ISO-8859-10\0ISO8859-10\0", ONIG_ENCODING_ISO_8859_10 }, #endif #ifdef ONIG_ENCODING_ISO_8859_11 { - "ISO-8859-11\0ISO8859-11\0ISO_8859_11\0ISO8859_11\0", + "ISO-8859-11\0ISO8859-11\0", ONIG_ENCODING_ISO_8859_11 }, #endif #ifdef ONIG_ENCODING_ISO_8859_13 { - "ISO-8859-13\0ISO8859-13\0ISO_8859_13\0ISO8859_13\0", + "ISO-8859-13\0ISO8859-13\0", ONIG_ENCODING_ISO_8859_13 }, #endif #ifdef ONIG_ENCODING_ISO_8859_14 { - "ISO-8859-14\0ISO8859-14\0ISO_8859_14\0ISO8859_14\0", + "ISO-8859-14\0ISO8859-14\0", ONIG_ENCODING_ISO_8859_14 }, #endif #ifdef ONIG_ENCODING_ISO_8859_15 { - "ISO-8859-15\0ISO8859-15\0ISO_8859_15\0ISO8859_15\0", + "ISO-8859-15\0ISO8859-15\0", ONIG_ENCODING_ISO_8859_15 }, #endif #ifdef ONIG_ENCODING_ISO_8859_16 { - "ISO-8859-16\0ISO8859-16\0ISO_8859_16\0ISO8859_16\0", + "ISO-8859-16\0ISO8859-16\0", ONIG_ENCODING_ISO_8859_16 }, #endif |