diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-02 08:22:15 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-02 08:22:15 +0000 |
| commit | 263ce88f9f2f713273e628bcef64e5f13cdbc2ff (patch) | |
| tree | 58bdd80c811af5b114684a94d1f772d1c09ccf6c /encoding.c | |
| parent | 22d508fc275ef1788e4510503217a7cc101bc6dd (diff) | |
| download | ruby-263ce88f9f2f713273e628bcef64e5f13cdbc2ff.tar.gz | |
encoding.c: preserved encindex
* encoding.c (rb_enc_init): register preserved indexes.
* internal.h (ruby_preserved_encindex): move from encoding.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41738 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/encoding.c b/encoding.c index 1e875018e4..cc6ce0768a 100644 --- a/encoding.c +++ b/encoding.c @@ -519,13 +519,6 @@ rb_encdb_set_unicode(int index) rb_enc_from_index(index)->flags |= ONIGENC_FLAG_UNICODE; } -enum { - ENCINDEX_ASCII, - ENCINDEX_UTF_8, - ENCINDEX_US_ASCII, - ENCINDEX_BUILTIN_MAX -}; - extern rb_encoding OnigEncodingUTF_8; extern rb_encoding OnigEncodingUS_ASCII; @@ -541,6 +534,10 @@ rb_enc_init(void) ENC_REGISTER(UTF_8); ENC_REGISTER(US_ASCII); #undef ENC_REGISTER +#ifndef NO_PRESERVED_ENCODING +#define ENCDB_REGISTER(name, enc) enc_register_at(ENCINDEX_##enc, name, NULL) +#undef ENCDB_REGISTER +#endif enc_table.count = ENCINDEX_BUILTIN_MAX; } |