diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-16 09:52:10 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-16 09:52:10 +0000 |
| commit | a8f67eed3d796b124f9c2abb5253ae53c2ed4f9c (patch) | |
| tree | 6ac6ffedb0fe7208dc73949d8391513900cca040 | |
| parent | c33343b9648f6de0b922aa824ca785a82dce9ba9 (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | win32/mkexports.rb | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Aug 16 18:52:08 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@segment7.net> * 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 |