From b3ee04c74650f4bc4eec6c31f2a25baad0ea531e Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 7 Jun 2008 16:32:17 +0000
Subject: 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_6@16893 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 win32/mkexports.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'win32')

diff --git a/win32/mkexports.rb b/win32/mkexports.rb
index 6ebe443fb3..092b349a22 100755
--- a/win32/mkexports.rb
+++ b/win32/mkexports.rb
@@ -9,8 +9,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
-- 
cgit v1.2.3