diff options
author | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-04 05:40:18 +0000 |
---|---|---|
committer | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-04 05:40:18 +0000 |
commit | 2c87c4b92887c24938eaa85f8d06b305104ef572 (patch) | |
tree | 93947c56926766c96f33cebc5226d088dd69c334 | |
parent | 4db94d8b22ad93505ee9e7bb6e3304c03e4e9d9c (diff) | |
download | ruby-2c87c4b92887c24938eaa85f8d06b305104ef572.tar.gz |
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
-rw-r--r-- | include/ruby/intern.h | 2 | ||||
-rw-r--r-- | 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*); @@ -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 |