From b16d1968e6376c0622093d0830c50272c929d63f Mon Sep 17 00:00:00 2001 From: ktsj Date: Sun, 4 Dec 2016 05:40:18 +0000 Subject: Revert changes on rb_frame_method_id_and_class() r56593 introduced backwards incompatible changes in the API. [ruby-core:78471] [Feature #12747] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56979 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/intern.h | 2 +- vm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/ruby/intern.h b/include/ruby/intern.h index 8776a596f0..efa8f4058c 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -969,7 +969,7 @@ VALUE rb_mod_remove_cvar(VALUE, VALUE); ID rb_frame_callee(void); VALUE rb_str_succ(VALUE); VALUE rb_time_succ(VALUE); -int rb_frame_method_id_and_class(ID *idp, ID *called_idp, VALUE *klassp); +int rb_frame_method_id_and_class(ID *idp, VALUE *klassp); VALUE rb_make_backtrace(void); VALUE rb_make_exception(int, const VALUE*); diff --git a/vm.c b/vm.c index 7cededc1e1..daa043d863 100644 --- a/vm.c +++ b/vm.c @@ -1982,9 +1982,9 @@ rb_thread_method_id_and_class(rb_thread_t *th, ID *idp, ID *called_idp, VALUE *k } int -rb_frame_method_id_and_class(ID *idp, ID *called_idp, VALUE *klassp) +rb_frame_method_id_and_class(ID *idp, VALUE *klassp) { - return rb_thread_method_id_and_class(GET_THREAD(), idp, called_idp, klassp); + return rb_thread_method_id_and_class(GET_THREAD(), idp, 0, klassp); } VALUE -- cgit v1.2.1