merges r22275 from trunk into ruby_1_9_1.

* vm_eval.c (eval_string_with_cref): use rb_vm_get_ruby_level_next_cfp()
  instead of vm_get_ruby_level_caller_cfp().  checking a upper frame
  is not enough.  [ruby-dev:37984]
* proc.c, vm_core.h: declare rb_vm_get_ruby_level_next_cfp()
  on vm_core.h.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22534 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 0 insertions, 2 deletions

diff --git a/proc.c b/proc.c
index 747b6bceb7..e9ebd174ea 100644
--- a/proc.c
+++ b/proc.c
@@ -271,8 +271,6 @@ binding_clone(VALUE self)
     return bindval;
 }
 
-rb_control_frame_t *rb_vm_get_ruby_level_next_cfp(rb_thread_t *th, rb_control_frame_t *cfp);
-
 VALUE
 rb_binding_new(void)
 {