From 2acbd7769526e59767d97a69da7fdac5d88bb5e4 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 28 Jan 2009 11:09:42 +0000 Subject: merges r21659 from trunk into ruby_1_9_1. * vm.c: add a prefix "rb_" to exposed functions vm_get_ruby_level_next_cfp(), rb_vm_make_env_object(), vm_stack_to_heap(), vm_make_proc(), vm_invoke_proc(), vm_get_sourceline(), vm_cref(), vm_localjump_error(), vm_make_jump_tag_but_local_jump(), vm_jump_tag_but_local_jump(). This changes may affect only core because most of renamed functions require a pointer of not-exposed struct such as rb_thread_t or NODE. In short, they are core functions. * cont.c, eval.c, eval_intern.h, load.c, proc.c, thread.c, vm_core.h, vm_dump.c, vm_eval.c, vm_exec.c, vm_insnhelper.c: ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21849 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_eval.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vm_eval.c') diff --git a/vm_eval.c b/vm_eval.c index 88fdae762..74d70d33d 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -734,7 +734,7 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char /* save new env */ GetISeqPtr(iseqval, iseq); if (bind && iseq->local_size > 0) { - bind->env = vm_make_env_object(th, th->cfp); + bind->env = rb_vm_make_env_object(th, th->cfp); } /* kick */ @@ -898,7 +898,7 @@ rb_eval_cmd(VALUE cmd, VALUE arg, int level) POP_TAG(); rb_set_safe_level_force(safe); - if (state) vm_jump_tag_but_local_jump(state, val); + if (state) rb_vm_jump_tag_but_local_jump(state, val); return val; } -- cgit