From 33379025f80282e59b4f4aff60190f2951a768db Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 28 Jan 2009 11:09:51 +0000 Subject: merges r21660 from trunk into ruby_1_9_1. * vm_eval.c, eval.c (rb_f_block_given_p): move definition of "iterator?" and "block_given?" to make static. * vm.c (vm_get_ruby_level_caller_cfp): make it static. * eval_intern.h, vm_insnhelper.c: move decl. of vm_get_ruby_level_caller_cfp() from eval_intern.h to vm_insnhelper.c. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- eval_intern.h | 1 - 1 file changed, 1 deletion(-) (limited to 'eval_intern.h') diff --git a/eval_intern.h b/eval_intern.h index 780be52791..40f64eca06 100644 --- a/eval_intern.h +++ b/eval_intern.h @@ -198,7 +198,6 @@ NORETURN(void rb_vm_jump_tag_but_local_jump(int, VALUE)); VALUE rb_vm_make_jump_tag_but_local_jump(int state, VALUE val); NODE *rb_vm_cref(void); -rb_control_frame_t *vm_get_ruby_level_caller_cfp(rb_thread_t *th, rb_control_frame_t *cfp); VALUE rb_obj_is_proc(VALUE); VALUE rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg, const rb_block_t *blockptr, VALUE filename); void rb_thread_terminate_all(void); -- cgit v1.2.3