diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-11 10:18:21 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-11 10:18:21 +0000 |
commit | 4701a70b31fdb07f560822d79b1d1f0742a82afb (patch) | |
tree | 71f740c418be1780e8fbddad13e7b5e884300292 /win32 | |
parent | 4db3a06d6f18d69879340510b25ddd704a00dff0 (diff) |
merge revision(s) 37625: [Backport #7333]
* win32/mkexports.rb (each_export): skip garbages generated by VS2012's
nmake.
reported and patched by Yoshida Masato at [Bug #7333] [ruby-dev:46484]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38320 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rwxr-xr-x | win32/mkexports.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/mkexports.rb b/win32/mkexports.rb index 22c0019294..cc3dcf2751 100755 --- a/win32/mkexports.rb +++ b/win32/mkexports.rb @@ -111,7 +111,7 @@ class Exports::Mswin < Exports next unless l.sub!(/.*?\s(\(\)\s+)?External\s+\|\s+/, '') is_data = !$1 if noprefix or /^[@_]/ =~ l - next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{8,16}$/ =~ l || + next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{8,32}$/ =~ l || /^_?(?:Init_|.*_threadptr_|DllMain\b)/ =~ l l.sub!(/^[@_]/, '') if /@\d+$/ !~ l elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1') |