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

1 files changed, 2 insertions, 5 deletions

diff --git a/bcc32/mkexports.rb b/bcc32/mkexports.rb
index d24efe4da4..e34b441e2f 100644
--- a/bcc32/mkexports.rb
+++ b/bcc32/mkexports.rb
@@ -5,7 +5,7 @@ STDIN.reopen(open("nul"))
 ARGV.each do |obj|
   IO.foreach("|tdump -q -oiPUBDEF -oiPUBD32 #{obj.tr('/', '\\')}") do |l|
     next unless /(?:PUBDEF|PUBD32)/ =~ l
-    SYM[$1] = !$2 if /'(.*?)'\s+Segment:\s+_(TEXT)?/ =~ l
+    SYM[$1] = true if /'(.*?)'/ =~ l
   end
 end
 
@@ -16,10 +16,7 @@ elsif $library
   exports << "Library " + $library
 end
 exports << "Description " + $description.dump if $description
-exports << "EXPORTS"
-SYM.sort.each do |sym, is_data|
-  exports << (is_data ? "#{sym} DATA" : sym)
-end
+exports << "EXPORTS" << SYM.keys.sort
 
 if $output
   open($output, 'w') {|f| f.puts exports.join("\n")}