akr	2007-09-30 04:06:40 +0900 (Sun, 30 Sep 2007)

  New Revision: 13571

  Modified files:
    trunk/ChangeLog
    trunk/re.c

  Log:
    * re.c (Init_Regexp): test DEFAULT_KCODE in C code because
      KCODE_EUC, etc are enum.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13571&r2=13570
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/re.c?r1=13571&r2=13570

Index: re.c
===================================================================
--- re.c	(revision 13570)
+++ re.c	(revision 13571)
@@ -2433,19 +2433,14 @@
     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);
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13570)
+++ ChangeLog	(revision 13571)
@@ -1,3 +1,8 @@
+Sun Sep 30 04:03:43 2007  Tanaka Akira  <akr@f...>
+
+	* 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  <usa@r...>
 
 	* variable.c (obj_ivar_each): get rid of warning.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml