usa	2012-12-11 19:18:21 +0900 (Tue, 11 Dec 2012)

  New Revision: 38320

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

  Log:
    merge revision(s) 37625: [Backport #7333]
    
    * win32/mkexports.rb (each_export): skip garbages generated by VS2012's
      nmake.
      reported and patched by Yoshida Masato at [Bug #7333] [ruby-dev:46484]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/version.h
    branches/ruby_1_9_3/win32/mkexports.rb

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 38319)
+++ ruby_1_9_3/ChangeLog	(revision 38320)
@@ -1,3 +1,9 @@
+Tue Dec 11 19:18:12 2012  NAKAMURA Usaku  <usa@r...>
+
+	* win32/mkexports.rb (each_export): skip garbages generated by VS2012's
+	  nmake.
+	  reported and patched by Yoshida Masato at [Bug #7333] [ruby-dev:46484]
+
 Tue Dec 11 19:15:51 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (parser_here_document): flush string content between new
Index: ruby_1_9_3/win32/mkexports.rb
===================================================================
--- ruby_1_9_3/win32/mkexports.rb	(revision 38319)
+++ ruby_1_9_3/win32/mkexports.rb	(revision 38320)
@@ -111,7 +111,7 @@
           next unless l.sub!(/.*?\s(\(\)\s+)?External\s+\|\s+/, '')
           is_data = !$1
           if noprefix or /^[@_]/ =~ l
-            next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{8,16}$/ =~ l ||
+            next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{8,32}$/ =~ l ||
               /^_?(?:Init_|.*_threadptr_|DllMain\b)/ =~ l
             l.sub!(/^[@_]/, '') if /@\d+$/ !~ l
           elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1')
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 38319)
+++ ruby_1_9_3/version.h	(revision 38320)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 338
+#define RUBY_PATCHLEVEL 339
 
 #define RUBY_RELEASE_DATE "2012-12-11"
 #define RUBY_RELEASE_YEAR 2012

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r37625


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