From 910b0709ed68184c84e93e122d3c42a36843a5e9 Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 29 Sep 2007 19:06:40 +0000 Subject: [PATCH] * 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 --- ChangeLog | 5 +++++ re.c | 21 ++++++++------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index b180578d7c..fd62693331 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Sep 30 04:03:43 2007 Tanaka Akira + + * re.c (Init_Regexp): test DEFAULT_KCODE in C code because + KCODE_EUC, etc are enum. + Sun Sep 30 00:55:40 2007 NAKAMURA Usaku * variable.c (obj_ivar_each): get rid of warning. 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);