kazu	2011-04-15 23:42:36 +0900 (Fri, 15 Apr 2011)

  New Revision: 31291

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31291

  Log:
    * ruby.c (proc_options): reduce warning: "ALLOW_DEFAULT_SOURCE_ENCODING" is not defined.

  Modified files:
    trunk/ChangeLog
    trunk/ruby.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31290)
+++ ChangeLog	(revision 31291)
@@ -1,3 +1,8 @@
+Fri Apr 15 23:41:18 2011  Kazuhiro NISHIYAMA  <zn@m...>
+
+	* ruby.c (proc_options): reduce warning:
+	  "ALLOW_DEFAULT_SOURCE_ENCODING" is not defined.
+
 Fri Apr 15 15:10:29 2011  Akinori MUSHA  <knu@i...>
 
 	* lib/uri/generic.rb (#route_from_path): Fix a bug where
Index: ruby.c
===================================================================
--- ruby.c	(revision 31290)
+++ ruby.c	(revision 31291)
@@ -1017,7 +1017,7 @@
 		    if (!*(s = ++p)) break;
 		    set_encoding_part(internal);
 		    if (!*(s = ++p)) break;
-#if ALLOW_DEFAULT_SOURCE_ENCODING
+#if defined ALLOW_DEFAULT_SOURCE_ENCODING && ALLOW_DEFAULT_SOURCE_ENCODING
 		    set_encoding_part(source);
 		    if (!*(s = ++p)) break;
 #endif
@@ -1032,7 +1032,7 @@
 	    else if (is_option_with_arg("external-encoding", Qfalse, Qtrue)) {
 		set_external_encoding_once(opt, s, 0);
 	    }
-#if ALLOW_DEFAULT_SOURCE_ENCODING
+#if defined ALLOW_DEFAULT_SOURCE_ENCODING && ALLOW_DEFAULT_SOURCE_ENCODING
 	    else if (is_option_with_arg("source-encoding", Qfalse, Qtrue)) {
 		set_source_encoding_once(opt, s, 0);
 	    }

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