diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:55:54 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:55:54 +0000 |
commit | dbe0299500739b01ba9e2dd3a99889fe8886f138 (patch) | |
tree | 721b517bfb576959c409462197c67a3a23cab9fd /vm_core.h | |
parent | 58281065f229f02e78d56873a21c1d2b3cc80a1c (diff) | |
download | ruby-dbe0299500739b01ba9e2dd3a99889fe8886f138.tar.gz ruby-dbe0299500739b01ba9e2dd3a99889fe8886f138.tar.xz ruby-dbe0299500739b01ba9e2dd3a99889fe8886f138.zip |
merges r20969 from trunk into ruby_1_9_1.
* vm.c (invoke_block_from_c): fix to point right cfp.
* vm.c (vm_make_proc, vm_make_proc_from_block), vm_core.h:
remove unused parameter cfp.
* vm_insnhelper.c, proc.c (proc_new): ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21026 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_core.h')
-rw-r--r-- | vm_core.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -582,7 +582,7 @@ int rb_thread_method_id_and_class(rb_thread_t *th, ID *idp, VALUE *klassp); VALUE vm_invoke_proc(rb_thread_t *th, rb_proc_t *proc, VALUE self, int argc, const VALUE *argv, rb_block_t *blockptr); -VALUE vm_make_proc(rb_thread_t *th, rb_control_frame_t *cfp, const rb_block_t *block, VALUE klass); +VALUE vm_make_proc(rb_thread_t *th, const rb_block_t *block, VALUE klass); VALUE vm_make_env_object(rb_thread_t *th, rb_control_frame_t *cfp); NOINLINE(void rb_gc_save_machine_context(rb_thread_t *)); |