ruby-changes:10474
From: usa <ko1@a...>
Date: Wed, 4 Feb 2009 11:50:17 +0900 (JST)
Subject: [ruby-changes:10474] Ruby:r22025 (trunk): * win32/mkexports.rb: shouldn't export DllMain.
usa 2009-02-04 11:50:04 +0900 (Wed, 04 Feb 2009) New Revision: 22025 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22025 Log: * win32/mkexports.rb: shouldn't export DllMain. reported at http://pc11.2ch.net/test/read.cgi/tech/1233686068/21 Modified files: trunk/ChangeLog trunk/win32/mkexports.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 22024) +++ ChangeLog (revision 22025) @@ -1,3 +1,8 @@ +Wed Feb 4 11:45:06 2009 NAKAMURA Usaku <usa@r...> + + * win32/mkexports.rb: shouldn't export DllMain. + reported at http://pc11.2ch.net/test/read.cgi/tech/1233686068/21 + Wed Feb 4 10:12:05 2009 Yukihiro Matsumoto <matz@r...> * missing/vsnprintf.c (BSD_vfprintf): should support 't' format Index: win32/mkexports.rb =================================================================== --- win32/mkexports.rb (revision 22024) +++ win32/mkexports.rb (revision 22025) @@ -110,7 +110,7 @@ next unless l.sub!(/.*?\s(\(\)\s+)?External\s+\|\s+/, '') is_data = !$1 if noprefix or /^[@_]/ =~ l - next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{16}$/ =~ l + next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{16}$/ =~ l || /^_DllMain@/ =~ l l.sub!(/^[@_]/, '') if /@\d+$/ !~ l elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1') next @@ -143,7 +143,8 @@ def each_export(objs) objdump(objs) do |l| - yield $2, !$1 if /\s(?:(T)|[[:upper:]])\s_((?!Init_).*)$/ =~ l + next if /@.*@/ =~ l + yield $2, !$1 if /\s(?:(T)|[[:upper:]])\s_((?!Init_|DllMain@).*)$/ =~ l end end end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/