diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | vm.c | 2 | ||||
-rw-r--r-- | vm_core.h | 2 |
3 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,12 @@ +Sat Aug 27 20:54:54 2011 Kazuki Tsujimoto <kazuki@callcc.net> + + * 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@callcc.net> * backport r33096 from trunk. @@ -479,7 +479,7 @@ rb_vm_make_env_object(rb_thread_t * th, rb_control_frame_t *cfp) 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 */ @@ -651,7 +651,7 @@ VALUE rb_vm_invoke_proc(rb_thread_t *th, rb_proc_t *proc, VALUE self, 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, |