usa	2012-12-20 18:34:55 +0900 (Thu, 20 Dec 2012)

  New Revision: 38500

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

  Log:
    merge revision(s) 38095: [Backport #7456]
    
    * compile.c (ADD_CATCH_ENTRY): add a cast to fix SEGV with x64 mingw
      on Windows 8. Without cast, 0 might be non zero value at higher bits
      in rb_ary_new3().
      [ruby-core:50258] [Bug #7456]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/compile.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 38499)
+++ ruby_1_9_3/ChangeLog	(revision 38500)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Thu Dec 20 18:34:38 2012  Hiroshi Shirosaki  <h.shirosaki@g...>
+
+	* compile.c (ADD_CATCH_ENTRY): add a cast to fix SEGV with x64 mingw
+	  on Windows 8. Without cast, 0 might be non zero value at higher bits
+	  in rb_ary_new3().
+	  [ruby-core:50258] [Bug #7456]
+
 Wed Dec 19 21:24:40 2012  NARUSE, Yui  <naruse@r...>
 
 	* io.c (argf_each_codepoint): add missing ARGF#codepoints [Bug #7438]
Index: ruby_1_9_3/compile.c
===================================================================
--- ruby_1_9_3/compile.c	(revision 38499)
+++ ruby_1_9_3/compile.c	(revision 38500)
@@ -251,7 +251,7 @@ r_value(VALUE value) https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/compile.c#L251
     (rb_ary_push(iseq->compile_data->catch_table_ary,		\
 		 rb_ary_new3(5, (type),				\
 			     (VALUE)(ls) | 1, (VALUE)(le) | 1,	\
-			     (iseqv), (VALUE)(lc) | 1)))
+			     (VALUE)(iseqv), (VALUE)(lc) | 1)))
 
 /* compile node */
 #define COMPILE(anchor, desc, node) \
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 38499)
+++ ruby_1_9_3/version.h	(revision 38500)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 346
+#define RUBY_PATCHLEVEL 347
 
-#define RUBY_RELEASE_DATE "2012-12-19"
+#define RUBY_RELEASE_DATE "2012-12-20"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 19
+#define RUBY_RELEASE_DAY 20
 
 #include "ruby/version.h"
 

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


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