usa	2012-07-27 12:14:49 +0900 (Fri, 27 Jul 2012)

  New Revision: 36544

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

  Log:
    * win32/mkexports.rb: should not export DllMain().
      reported by luis at [ruby-core:46743] [Bug #6790], solved by
      Heesob Park, and confirmed by nobu.

  Modified files:
    trunk/ChangeLog
    trunk/win32/mkexports.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36543)
+++ ChangeLog	(revision 36544)
@@ -1,3 +1,9 @@
+Fri Jul 27 12:12:36 2012  NAKAMURA Usaku  <usa@r...>
+
+	* win32/mkexports.rb: should not export DllMain().
+	  reported by luis at [ruby-core:46743] [Bug #6790], solved by
+	  Heesob Park, and confirmed by nobu.
+
 Thu Jul 26 14:51:29 2012  URABE Shyouhei  <shyouhei@r...>
 
 	* test/net/http/test_https.rb (TestNetHTTPS#test_session_reuse):
Index: win32/mkexports.rb
===================================================================
--- win32/mkexports.rb	(revision 36543)
+++ win32/mkexports.rb	(revision 36544)
@@ -116,7 +116,7 @@
           is_data = !$1
           if noprefix or /^[@_]/ =~ l
             next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{8,16}$/ =~ l ||
-              /^_(?:Init_|.*_threadptr_|DllMain@)/ =~ l
+              /^_?(?:Init_|.*_threadptr_|DllMain\b)/ =~ l
             l.sub!(/^[@_]/, '') if /@\d+$/ !~ l
           elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1')
             next
@@ -150,7 +150,7 @@
   def each_export(objs)
     symprefix = RbConfig::CONFIG["SYMBOL_PREFIX"]
     symprefix.strip! if symprefix
-    re = /\s(?:(T)|[[:upper:]])\s#{symprefix}((?!Init_|.*_threadptr_|DllMain@).*)$/
+    re = /\s(?:(T)|[[:upper:]])\s#{symprefix}((?!Init_|.*_threadptr_|DllMain\b).*)$/
     objdump(objs) do |l|
       next if /@.*@/ =~ l
       yield $2, !$1 if re =~ l

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