ruby-changes:21051
From: ktsj <ko1@a...>
Date: Sat, 27 Aug 2011 21:02:10 +0900 (JST)
Subject: [ruby-changes:21051] ktsj:r33100 (ruby_1_9_3): * vm.c (rb_vm_rewrite_dfp_in_errinfo): change return type
ktsj 2011-08-27 21:02:00 +0900 (Sat, 27 Aug 2011) New Revision: 33100 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33100 Log: * vm.c (rb_vm_rewrite_dfp_in_errinfo): change return type to suppress a warning. * vm_core.h: ditto. Modified files: branches/ruby_1_9_3/ChangeLog branches/ruby_1_9_3/vm.c branches/ruby_1_9_3/vm_core.h Index: ruby_1_9_3/ChangeLog =================================================================== --- ruby_1_9_3/ChangeLog (revision 33099) +++ ruby_1_9_3/ChangeLog (revision 33100) @@ -1,3 +1,12 @@ +Sat Aug 27 20:54:54 2011 Kazuki Tsujimoto <kazuki@c...> + + * backport r33099 from trunk. + + * vm.c (rb_vm_rewrite_dfp_in_errinfo): change return type + to suppress a warning. + + * vm_core.h: ditto. + Sat Aug 27 19:03:44 2011 Kazuki Tsujimoto <kazuki@c...> * backport r33096 from trunk. Index: ruby_1_9_3/vm_core.h =================================================================== --- ruby_1_9_3/vm_core.h (revision 33099) +++ ruby_1_9_3/vm_core.h (revision 33100) @@ -651,7 +651,7 @@ int argc, const VALUE *argv, const rb_block_t *blockptr); VALUE rb_vm_make_proc(rb_thread_t *th, const rb_block_t *block, VALUE klass); VALUE rb_vm_make_env_object(rb_thread_t *th, rb_control_frame_t *cfp); -VALUE rb_vm_rewrite_dfp_in_errinfo(rb_thread_t *th, rb_control_frame_t *cfp); +void rb_vm_rewrite_dfp_in_errinfo(rb_thread_t *th, rb_control_frame_t *cfp); void rb_vm_inc_const_missing_count(void); void rb_vm_gvl_destroy(rb_vm_t *vm); VALUE rb_vm_call(rb_thread_t *th, VALUE recv, VALUE id, int argc, Index: ruby_1_9_3/vm.c =================================================================== --- ruby_1_9_3/vm.c (revision 33099) +++ ruby_1_9_3/vm.c (revision 33100) @@ -479,7 +479,7 @@ return envval; } -VALUE +void rb_vm_rewrite_dfp_in_errinfo(rb_thread_t *th, rb_control_frame_t *cfp) { /* rewrite dfp in errinfo to point to heap */ -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/