diff options
author | kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-04-15 14:42:36 +0000 |
---|---|---|
committer | kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-04-15 14:42:36 +0000 |
commit | 82fd7175b50998c72b9db1017573d93d39e83024 (patch) | |
tree | 2a2213a1ae542afb22844884c0498a421a942d04 | |
parent | 09bafe3cce2609b6f890ad59ceb6948b2939c1e0 (diff) | |
download | ruby-82fd7175b50998c72b9db1017573d93d39e83024.tar.gz |
* 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ruby.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Fri Apr 15 23:41:18 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> + + * ruby.c (proc_options): reduce warning: + "ALLOW_DEFAULT_SOURCE_ENCODING" is not defined. + Fri Apr 15 15:10:29 2011 Akinori MUSHA <knu@iDaemons.org> * lib/uri/generic.rb (#route_from_path): Fix a bug where @@ -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); } |