From 82fd7175b50998c72b9db1017573d93d39e83024 Mon Sep 17 00:00:00 2001 From: kazu Date: Fri, 15 Apr 2011 14:42:36 +0000 Subject: [PATCH] * ruby.c (proc_options): reduce warning: "ALLOW_DEFAULT_SOURCE_ENCODING" is not defined. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ruby.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d9d6d6770..16e7119723 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Apr 15 23:41:18 2011 Kazuhiro NISHIYAMA + + * ruby.c (proc_options): reduce warning: + "ALLOW_DEFAULT_SOURCE_ENCODING" is not defined. + Fri Apr 15 15:10:29 2011 Akinori MUSHA * lib/uri/generic.rb (#route_from_path): Fix a bug where diff --git a/ruby.c b/ruby.c index 88305f03ef..3cfa2854c8 100644 --- a/ruby.c +++ b/ruby.c @@ -1017,7 +1017,7 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt) 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 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt) 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); }