summaryrefslogtreecommitdiff
path: root/re.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-09-29 19:06:40 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-09-29 19:06:40 +0000
commit910b0709ed68184c84e93e122d3c42a36843a5e9 (patch)
treebc5b0333547d1d388bbc2cfe7d71d0a57556c3cc /re.c
parent38694262ef41c6071ec58fee794212545700c752 (diff)
* re.c (Init_Regexp): test DEFAULT_KCODE in C code because
KCODE_EUC, etc are enum. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13571 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r--re.c21
1 files changed, 8 insertions, 13 deletions
diff --git a/re.c b/re.c
index 871ee60738..b1c5fb93f1 100644
--- a/re.c
+++ b/re.c
@@ -2433,19 +2433,14 @@ 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);
-#endif
-#endif
-#endif
+ 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);
rb_define_virtual_variable("$~", match_getter, match_setter);
rb_define_virtual_variable("$&", last_match_getter, 0);