mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
merges r22025 from trunk into ruby_1_9_1.
* win32/mkexports.rb: shouldn't export DllMain.
reported at 1233686068/21
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
441746f466
commit
de16edce97
2 changed files with 8 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Wed Feb 4 11:45:06 2009 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||||
|
|
||||||
|
* 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@ruby-lang.org>
|
Wed Feb 4 10:12:05 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
* missing/vsnprintf.c (BSD_vfprintf): should support 't' format
|
* missing/vsnprintf.c (BSD_vfprintf): should support 't' format
|
||||||
|
|
|
@ -110,7 +110,7 @@ class Exports::Mswin < Exports
|
||||||
next unless l.sub!(/.*?\s(\(\)\s+)?External\s+\|\s+/, '')
|
next unless l.sub!(/.*?\s(\(\)\s+)?External\s+\|\s+/, '')
|
||||||
is_data = !$1
|
is_data = !$1
|
||||||
if noprefix or /^[@_]/ =~ l
|
if noprefix or /^[@_]/ =~ l
|
||||||
next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{16}$/ =~ l
|
next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{16}$/ =~ l || /^_DllMain@/ =~ l
|
||||||
l.sub!(/^[@_]/, '') if /@\d+$/ !~ l
|
l.sub!(/^[@_]/, '') if /@\d+$/ !~ l
|
||||||
elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1')
|
elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1')
|
||||||
next
|
next
|
||||||
|
@ -143,7 +143,8 @@ class Exports::Mingw < Exports
|
||||||
|
|
||||||
def each_export(objs)
|
def each_export(objs)
|
||||||
objdump(objs) do |l|
|
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
|
||||||
yield "strcasecmp", "_stricmp"
|
yield "strcasecmp", "_stricmp"
|
||||||
yield "strncasecmp", "_strnicmp"
|
yield "strncasecmp", "_strnicmp"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue