From a8f67eed3d796b124f9c2abb5253ae53c2ed4f9c Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 16 Aug 2011 09:52:10 +0000 Subject: [PATCH] * win32/mkexports.rb (Exports::Mswin#each_export): exclude Init_ and _threadptr_ functions, as well as mingw. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32985 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ win32/mkexports.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 129731e6fb..508f09f7fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Aug 16 18:52:08 2011 Nobuyoshi Nakada + + * 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 * backport r32981 and r32982 from trunk. diff --git a/win32/mkexports.rb b/win32/mkexports.rb index 06f8c8ddbb..9b450519ce 100755 --- a/win32/mkexports.rb +++ b/win32/mkexports.rb @@ -111,7 +111,8 @@ class Exports::Mswin < Exports 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