diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-10-24 15:58:51 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-10-24 15:58:51 +0000 |
| commit | e32943363088035c04b63b54cbe5179c4f5cd527 (patch) | |
| tree | 676e32d826aaa834d6f7307d8f9b21515a771cab /win32 | |
| parent | 23a68ff2ff8264faef9ad22679e91caf6e76b78b (diff) | |
* 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
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/mkexports.rb | 4 | ||||
| -rw-r--r-- | win32/resource.rb | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/win32/mkexports.rb b/win32/mkexports.rb index e92aae0422..2fe867eb1b 100644 --- a/win32/mkexports.rb +++ b/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 diff --git a/win32/resource.rb b/win32/resource.rb index cb62fb97c4..c7201bbeda 100644 --- a/win32/resource.rb +++ b/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} |