* win32/mkexports.rb, win32/resource.rb: use unique variable names.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11214 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,7 @@
+Wed Oct 25 00:58:19 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/mkexports.rb, win32/resource.rb: use unique variable names.
+
 Mon Oct 23 04:30:04 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* marshal.c (r_object0): use return value from proc given as the

win32/mkexports.rb

@@ -14,7 +14,7 @@ class Exports
 
   def self.create(*args, &block)
     platform = RUBY_PLATFORM
-    pat, klass = @subclass.find {|pat, klass| pat =~ platform}
+    pat, klass = @subclass.find {|p, k| p =~ platform}
     unless klass
       raise ArgumentError, "unsupported platform: #{platform}"
     end
@@ -36,7 +36,6 @@ class Exports
   def initialize(objs)
     syms = {}
     winapis = {}
-    internal = export = nil
     each_export(objs) do |internal, export|
       syms[internal] = export
       winapis[$1] = internal if /^_?(rb_w32_\w+)(?:@\d+)?$/ =~ internal
@@ -62,7 +61,6 @@ class Exports
       exports << "Library " + library
     end
     exports << "Description " + description.dump if description
-    k = v = nil
     exports << "EXPORTS" << symbols()
     exports
   end

win32/resource.rb

@@ -48,7 +48,7 @@ end
   [$ruby_name,   CONFIG["EXEEXT"], 'VFT_APP', 'CUI', ruby_icon],
   [$rubyw_name,  CONFIG["EXEEXT"], 'VFT_APP', 'GUI', rubyw_icon || ruby_icon],
   [$so_name,     '.dll',           'VFT_DLL', 'DLL', dll_icons.join],
-].each do |base, ext, type, desc, icons|
+].each do |base, ext, type, desc, icon|
   open(base + '.rc', "w") { |f|
     f.binmode if /mingw/ =~ RUBY_PLATFORM
 
@@ -58,7 +58,7 @@ end
 #include <winver.h>
 #endif
 
-#{icons || ''}
+#{icon || ''}
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION    #{fversion}
  PRODUCTVERSION #{fversion}