[前][次][番号順一覧][スレッド一覧]

ruby-changes:10934

From: yugui <ko1@a...>
Date: Sun, 22 Feb 2009 18:47:34 +0900 (JST)
Subject: [ruby-changes:10934] Ruby:r22510 (ruby_1_9_1): merges r22025 from trunk into ruby_1_9_1.

yugui	2009-02-22 18:47:21 +0900 (Sun, 22 Feb 2009)

  New Revision: 22510

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22510

  Log:
    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

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/win32/mkexports.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 22509)
+++ ruby_1_9_1/ChangeLog	(revision 22510)
@@ -1,3 +1,8 @@
+Wed Feb  4 11:45:06 2009  NAKAMURA Usaku  <usa@r...>
+
+	* 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@r...>
 
 	* missing/vsnprintf.c (BSD_vfprintf): should support 't' format
Index: ruby_1_9_1/win32/mkexports.rb
===================================================================
--- ruby_1_9_1/win32/mkexports.rb	(revision 22509)
+++ ruby_1_9_1/win32/mkexports.rb	(revision 22510)
@@ -110,7 +110,7 @@
           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 @@
 
   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"

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]