From 69597b67dec495c4e3f7ff2e9fae6602c7c50083 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 22 Feb 2009 09:47:21 +0000 Subject: merges r22025 from trunk into ruby_1_9_1. * win32/mkexports.rb: shouldn't export DllMain. reported at http://pc11.2ch.net/test/read.cgi/tech/1233686068/21 git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@22510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/mkexports.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'win32') diff --git a/win32/mkexports.rb b/win32/mkexports.rb index 4d7eeb57e..6c480ef3f 100755 --- a/win32/mkexports.rb +++ b/win32/mkexports.rb @@ -110,7 +110,7 @@ class Exports::Mswin < Exports 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 @@ class Exports::Mingw < Exports 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 yield "strcasecmp", "_stricmp" yield "strncasecmp", "_strnicmp" -- cgit