naruse	2012-07-28 04:04:19 +0900 (Sat, 28 Jul 2012)

  New Revision: 36552

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

  Log:
    merge revision(s) 36454:
    
    * include/ruby/intern.h (rb_num_zerodiv): Added NORETURN.
      Patched by Xi Wang. [Bug #6736]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/include/ruby/intern.h
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/include/ruby/intern.h
===================================================================
--- ruby_1_9_3/include/ruby/intern.h	(revision 36551)
+++ ruby_1_9_3/include/ruby/intern.h	(revision 36552)
@@ -492,7 +492,7 @@
 VALUE rb_marshal_load(VALUE);
 void rb_marshal_define_compat(VALUE newclass, VALUE oldclass, VALUE (*dumper)(VALUE), VALUE (*loader)(VALUE, VALUE));
 /* numeric.c */
-void rb_num_zerodiv(void);
+NORETURN(void rb_num_zerodiv(void));
 #define RB_NUM_COERCE_FUNCS_NEED_OPID 1
 VALUE rb_num_coerce_bin(VALUE, VALUE, ID);
 VALUE rb_num_coerce_cmp(VALUE, VALUE, ID);
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 36551)
+++ ruby_1_9_3/ChangeLog	(revision 36552)
@@ -1,3 +1,8 @@
+Sat Jul 28 04:04:01 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* include/ruby/intern.h (rb_num_zerodiv): Added NORETURN.
+	  Patched by Xi Wang. [Bug #6736]
+
 Wed Jul  4 19:36:17 2012  NAKAMURA Usaku  <usa@r...>
 
 	* ext/dl/cfunc.c (rb_dlcfunc_call): also needed the workaround for VC8
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 36551)
+++ ruby_1_9_3/version.h	(revision 36552)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 253
+#define RUBY_PATCHLEVEL 254
 
-#define RUBY_RELEASE_DATE "2012-07-04"
+#define RUBY_RELEASE_DATE "2012-07-28"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 4
+#define RUBY_RELEASE_DAY 28
 
 #include "ruby/version.h"
 

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