summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/iconv/charset_alias.rb3
-rw-r--r--ext/iconv/mkwrapper.rb4
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 81e0f5b5cc..fa0130f19f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 3 20:10:52 2010 Tanaka Akira <akr@fsij.org>
+
+ * ext/iconv/charset_alias.rb: pass block argument to outer local
+ variable.
+
Wed Feb 3 20:08:05 2010 Tanaka Akira <akr@fsij.org>
* file.c (realpath_rec): rb_path_last_separator may return NULL.
diff --git a/ext/iconv/charset_alias.rb b/ext/iconv/charset_alias.rb
index d4ed9139c8..e0a0a82c39 100644
--- a/ext/iconv/charset_alias.rb
+++ b/ext/iconv/charset_alias.rb
@@ -95,7 +95,8 @@ end
target = OS
opt = nil
-ARGV.options do |opt|
+ARGV.options do |opt2|
+ opt = opt2
opt.banner << " config.status map.rb"
opt.on("--target OS") {|t| target = t}
opt.parse! and (1..2) === ARGV.size
diff --git a/ext/iconv/mkwrapper.rb b/ext/iconv/mkwrapper.rb
index 34718507d6..6438e57fec 100644
--- a/ext/iconv/mkwrapper.rb
+++ b/ext/iconv/mkwrapper.rb
@@ -43,9 +43,9 @@ def charset_alias(config_charset, mapfile = nil)
end
src << " end" << "end"
if mapfile
- open(mapfile, "wb") {|f| f.puts *src}
+ open(mapfile, "wb") {|f| f.puts(*src)}
else
- puts *src
+ puts(*src)
end
end