archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 09:04:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) 36454:

Browse source 
* include/ruby/intern.h (rb_num_zerodiv): Added NORETURN.
	  Patched by Xi Wang. [Bug #6736]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36552 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-07-27 19:04:19 +00:00
parent 24d1ff57c7
commit 2dc1a7330c
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Jul 28 04:04:01 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* 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@ruby-lang.org> Wed Jul 4 19:36:17 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/dl/cfunc.c (rb_dlcfunc_call): also needed the workaround for VC8 * ext/dl/cfunc.c (rb_dlcfunc_call): also needed the workaround for VC8

2
include/ruby/intern.h
View file

@ -492,7 +492,7 @@ VALUE rb_marshal_dump(VALUE, VALUE);
VALUE rb_marshal_load(VALUE); VALUE rb_marshal_load(VALUE);
void rb_marshal_define_compat(VALUE newclass, VALUE oldclass, VALUE (*dumper)(VALUE), VALUE (*loader)(VALUE, VALUE)); void rb_marshal_define_compat(VALUE newclass, VALUE oldclass, VALUE (*dumper)(VALUE), VALUE (*loader)(VALUE, VALUE));
/* numeric.c */ /* numeric.c */
void rb_num_zerodiv(void); NORETURN(void rb_num_zerodiv(void));
#define RB_NUM_COERCE_FUNCS_NEED_OPID 1 #define RB_NUM_COERCE_FUNCS_NEED_OPID 1
VALUE rb_num_coerce_bin(VALUE, VALUE, ID); VALUE rb_num_coerce_bin(VALUE, VALUE, ID);
VALUE rb_num_coerce_cmp(VALUE, VALUE, ID); VALUE rb_num_coerce_cmp(VALUE, VALUE, ID);

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "1.9.3" #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_YEAR 2012
#define RUBY_RELEASE_MONTH 7 #define RUBY_RELEASE_MONTH 7
#define RUBY_RELEASE_DAY 4 #define RUBY_RELEASE_DAY 28
#include "ruby/version.h" #include "ruby/version.h"