diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-27 19:04:19 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-27 19:04:19 +0000 |
| commit | 2dc1a7330c930d256ccda24f36cd86b4ac945776 (patch) | |
| tree | 1549f5388318f89b5e316fd39aff826f73941401 | |
| parent | 24d1ff57c737995e85873852235786bfaa8c1f02 (diff) | |
merge revision(s) 36454:
* 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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | include/ruby/intern.h | 2 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 9 insertions, 4 deletions
@@ -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> * ext/dl/cfunc.c (rb_dlcfunc_call): also needed the workaround for VC8 diff --git a/include/ruby/intern.h b/include/ruby/intern.h index 50451f35b3..6dec838e75 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -492,7 +492,7 @@ VALUE rb_marshal_dump(VALUE, VALUE); 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); @@ -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" |