diff options
| author | Gustavo André dos Santos Lopes <cataphract@php.net> | 2011-01-25 10:57:07 +0000 |
|---|---|---|
| committer | Gustavo André dos Santos Lopes <cataphract@php.net> | 2011-01-25 10:57:07 +0000 |
| commit | 4a946a91e5d0e431126e38bf53efce75d7b66324 (patch) | |
| tree | b141d35d099255f7bed91461593b2ea3f3c2e4be /ext/standard/html_tables.h | |
| parent | 05b2d22a001b817c096526d8c6d12cf0cc6be086 (diff) | |
| download | php-git-4a946a91e5d0e431126e38bf53efce75d7b66324.tar.gz | |
- Fixed CHARSET_UNICODE_COMPAT (ISO-8859-1 is compatible in the relevant sense).
- Fixed usage of zend_multibyte_get_internal_encoding (its return cannot be
cast to char*).
- Change tests to reflect that charset detection now relies on
internal_encoding, not on current_internal_encoding.
NOTE: This fixes the changes in rev 306077, but it remains that that change
introduced a BC break. I assumed it was intentional
Diffstat (limited to 'ext/standard/html_tables.h')
| -rw-r--r-- | ext/standard/html_tables.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/html_tables.h b/ext/standard/html_tables.h index c6a75bef8d..278b6db428 100644 --- a/ext/standard/html_tables.h +++ b/ext/standard/html_tables.h @@ -33,7 +33,7 @@ enum entity_charset { cs_utf_8, cs_8859_1, cs_cp1252, cs_8859_15, cs_cp1251, cs_gb2312, cs_big5hkscs, cs_sjis, cs_eucjp, cs_numelems /* used to count the number of charsets */ }; -#define CHARSET_UNICODE_COMPAT(cs) ((cs) <= cs_utf_8) +#define CHARSET_UNICODE_COMPAT(cs) ((cs) <= cs_8859_1) #define CHARSET_SINGLE_BYTE(cs) ((cs) > cs_utf_8 && (cs) < cs_big5) #define CHARSET_PARTIAL_SUPPORT(cs) ((cs) >= cs_big5) |