diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-05 17:39:59 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-05 17:39:59 +0000 |
commit | bd00bb3ef75b469a83a8eac6995bb6800a22c15a (patch) | |
tree | 6ea7eb9277a0bef146b05c84829b88a7bf0525da /re.c | |
parent | b5b6d1f0ea914515adf9e11849bc365fd04f26b5 (diff) | |
download | ruby-bd00bb3ef75b469a83a8eac6995bb6800a22c15a.tar.gz |
* include/ruby/defines.h: no longer provide DEFAULT_KCODE.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13640 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r-- | re.c | 11 |
1 files changed, 2 insertions, 9 deletions
@@ -152,7 +152,7 @@ rb_memsearch(const void *x0, long m, const void *y0, long n) #define ARG_KCODE_UTF8 (ARG_KCODE_UNIT * 4) #define ARG_KCODE_MASK (ARG_KCODE_UNIT * 7) -static int reg_kcode = DEFAULT_KCODE; +static int reg_kcode = KCODE_NONE; static int char_to_option(int c) @@ -2406,14 +2406,7 @@ Init_Regexp(void) rb_eRegexpError = rb_define_class("RegexpError", rb_eStandardError); onigenc_set_default_caseconv_table((UChar*)casetable); - if (DEFAULT_KCODE == KCODE_EUC) - onigenc_set_default_encoding(ONIG_ENCODING_EUC_JP); - else if (DEFAULT_KCODE == KCODE_SJIS) - onigenc_set_default_encoding(ONIG_ENCODING_SJIS); - else if (DEFAULT_KCODE == KCODE_UTF8) - onigenc_set_default_encoding(ONIG_ENCODING_UTF8); - else - onigenc_set_default_encoding(ONIG_ENCODING_ASCII); + onigenc_set_default_encoding(ONIG_ENCODING_ASCII); rb_define_virtual_variable("$~", match_getter, match_setter); rb_define_virtual_variable("$&", last_match_getter, 0); |