diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-15 13:36:18 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-15 13:36:18 +0000 |
| commit | edc61cf4c19c089d210c7774994ee6d57bff65ad (patch) | |
| tree | e7ed05f4840d0eb293ad4420c212debca496a2b0 /encoding.c | |
| parent | d2a377d747c707bed4c2fb880fe4147807801e08 (diff) | |
* encoding.c (ENC_REGISTER): use &OnigEncoding*.
(ENCINDEX_UTF_8): renamed from ENCINDEX_UTF8.
(rb_enc_init): use ENC_REGISTER.
* include/ruby/oniguruma.h (OnigEncodingUTF8, ONIG_ENCODING_UTF8):
removed.
* enc/*.c: remove use of &encoding_*; use enc argument instead.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15067 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/encoding.c b/encoding.c index d76e8edfb4..4b121ac4e1 100644 --- a/encoding.c +++ b/encoding.c @@ -303,21 +303,22 @@ rb_enc_alias(const char *alias, const char *orig) enum { ENCINDEX_ASCII, - ENCINDEX_UTF8, + ENCINDEX_UTF_8, ENCINDEX_US_ASCII, ENCINDEX_BUILTIN_MAX }; +extern rb_encoding OnigEncodingUTF_8; extern rb_encoding OnigEncodingUS_ASCII; void rb_enc_init(void) { enc_table.count = enc_table_expand(ENCINDEX_BUILTIN_MAX); -#define ENC_REGISTER(enc) enc_register_at(ENCINDEX_##enc, rb_enc_name(ONIG_ENCODING_##enc), ONIG_ENCODING_##enc) +#define ENC_REGISTER(enc) enc_register_at(ENCINDEX_##enc, rb_enc_name(&OnigEncoding##enc), &OnigEncoding##enc) ENC_REGISTER(ASCII); - ENC_REGISTER(UTF8); - enc_register_at(ENCINDEX_US_ASCII, rb_enc_name(&OnigEncodingUS_ASCII), &OnigEncodingUS_ASCII); + ENC_REGISTER(UTF_8); + ENC_REGISTER(US_ASCII); #undef ENC_REGISTER } @@ -868,7 +869,7 @@ rb_utf8_encoding(void) if (!enc_table.list) { rb_enc_init(); } - return enc_table.list[ENCINDEX_UTF8].enc; + return enc_table.list[ENCINDEX_UTF_8].enc; } rb_encoding * |