summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 16:30:49 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 16:30:49 +0000
commitbf96b999c05a65ad3d4100d5055b702c5ae30138 (patch)
tree0a3f214a042acb6d91cfce6e8e1af24c886560a8 /win32
parentefa1e84e252842ac0b1dc4c78f4f6c6177e63604 (diff)
merge revision(s) 13694:
* win32/mkexports.rb: deal with __fastcall name decorations. [ruby-list:44111] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@16891 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/mkexports.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/win32/mkexports.rb b/win32/mkexports.rb
index 72b3b95d1c..6f0a6a6ae2 100644
--- a/win32/mkexports.rb
+++ b/win32/mkexports.rb
@@ -7,8 +7,9 @@ IO.foreach("|dumpbin -symbols " + objs.join(' ')) do |l|
next if /^[0-9A-F]+ 0+ UNDEF / =~ l
next unless l.sub!(/.*?\s(\(\)\s+)?External\s+\|\s+/, "")
is_data = !$1
- if l.sub!(/^_/, '')
- next if /@.*@/ =~ l || /@[0-9a-f]{16}$/ =~ l
+ if /^[@_](?!\w+@\d+$)/ =~ l
+ next if /(?!^)@.*@/ =~ l || /@[0-9a-f]{16}$/ =~ l
+ l.sub!(/^[@_]/, '')
elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1')
next
end