diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-14 13:49:29 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-14 13:49:29 +0000 |
| commit | d9ff499bf3b4772b2657c8182f33180e9f70db49 (patch) | |
| tree | 98c3bcc9a1f424ecdcf3e97bf0f35494b5ce17e9 /encoding.c | |
| parent | 45432a6d2b22bbc7318819e251127021810a728d (diff) | |
* re.c (rb_char_to_option_kcode): use rb_enc_find_index() instead
of using fixed index value.
* enc/Makefile.in (encsrcdir): make US-ASCII built-in.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15047 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/encoding.c b/encoding.c index 01677d1b92..4e3a02f173 100644 --- a/encoding.c +++ b/encoding.c @@ -304,9 +304,12 @@ rb_enc_alias(const char *alias, const char *orig) enum { ENCINDEX_ASCII, ENCINDEX_UTF8, + ENCINDEX_US_ASCII, ENCINDEX_BUILTIN_MAX }; +extern rb_encoding OnigEncodingUS_ASCII; + void rb_enc_init(void) { @@ -314,6 +317,7 @@ rb_enc_init(void) #define ENC_REGISTER(enc) enc_register_at(ENCINDEX_##enc, rb_enc_name(ONIG_ENCODING_##enc), ONIG_ENCODING_##enc) ENC_REGISTER(ASCII); ENC_REGISTER(UTF8); + enc_register_at(ENCINDEX_US_ASCII, rb_enc_name(&OnigEncodingUS_ASCII), &OnigEncodingUS_ASCII); #undef ENC_REGISTER } |