ruby-changes:20936
From: nobu <ko1@a...>
Date: Tue, 16 Aug 2011 18:52:20 +0900 (JST)
Subject: [ruby-changes:20936] nobu:r32985 (trunk, ruby_1_9_3): * win32/mkexports.rb (Exports::Mswin#each_export): exclude Init_
nobu 2011-08-16 18:52:10 +0900 (Tue, 16 Aug 2011) New Revision: 32985 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32985 Log: * win32/mkexports.rb (Exports::Mswin#each_export): exclude Init_ and _threadptr_ functions, as well as mingw. Modified files: branches/ruby_1_9_3/ChangeLog branches/ruby_1_9_3/win32/mkexports.rb trunk/ChangeLog trunk/win32/mkexports.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 32984) +++ ChangeLog (revision 32985) @@ -1,3 +1,8 @@ +Tue Aug 16 18:52:08 2011 Nobuyoshi Nakada <nobu@r...> + + * win32/mkexports.rb (Exports::Mswin#each_export): exclude Init_ + and _threadptr_ functions, as well as mingw. + Tue Aug 16 09:31:44 2011 Eric Hodel <drbrain@s...> * ext/dl: Add documentation. Patch by Vincent Batts. Index: win32/mkexports.rb =================================================================== --- win32/mkexports.rb (revision 32984) +++ win32/mkexports.rb (revision 32985) @@ -111,7 +111,8 @@ next unless l.sub!(/.*?\s(\(\)\s+)?External\s+\|\s+/, '') is_data = !$1 if noprefix or /^[@_]/ =~ l - next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{8,16}$/ =~ l || /^_DllMain@/ =~ l + next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{8,16}$/ =~ l || + /^_(?:Init_|.*_threadptr_|DllMain@)/ =~ l l.sub!(/^[@_]/, '') if /@\d+$/ !~ l elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1') next Index: ruby_1_9_3/ChangeLog =================================================================== --- ruby_1_9_3/ChangeLog (revision 32984) +++ ruby_1_9_3/ChangeLog (revision 32985) @@ -1,3 +1,8 @@ +Tue Aug 16 18:52:08 2011 Nobuyoshi Nakada <nobu@r...> + + * win32/mkexports.rb (Exports::Mswin#each_export): exclude Init_ + and _threadptr_ functions, as well as mingw. + Tue Aug 16 09:38:37 2011 Eric Hodel <drbrain@s...> * backport r32981 and r32982 from trunk. Index: ruby_1_9_3/win32/mkexports.rb =================================================================== --- ruby_1_9_3/win32/mkexports.rb (revision 32984) +++ ruby_1_9_3/win32/mkexports.rb (revision 32985) @@ -111,7 +111,8 @@ next unless l.sub!(/.*?\s(\(\)\s+)?External\s+\|\s+/, '') is_data = !$1 if noprefix or /^[@_]/ =~ l - next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{8,16}$/ =~ l || /^_DllMain@/ =~ l + next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{8,16}$/ =~ l || + /^_(?:Init_|.*_threadptr_|DllMain@)/ =~ l l.sub!(/^[@_]/, '') if /@\d+$/ !~ l elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1') next -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/