From eb93987cd4c7a483839054e6a19b46f44d9b839b 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vm.c') diff --git a/vm.c b/vm.c index bd7826f6f..973220652 100644 --- a/vm.c +++ b/vm.c @@ -146,7 +146,7 @@ rb_vm_get_ruby_level_next_cfp(rb_thread_t *th, rb_control_frame_t *cfp) return 0; } -rb_control_frame_t * +static rb_control_frame_t * vm_get_ruby_level_caller_cfp(rb_thread_t *th, rb_control_frame_t *cfp) { if (RUBY_VM_NORMAL_ISEQ_P(cfp->iseq)) { -- cgit