diff options
| author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-24 13:33:44 +0000 |
|---|---|---|
| committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-24 13:33:44 +0000 |
| commit | f40f3508af395021691d3a5155c0426e033626bf (patch) | |
| tree | c81d7ec7417ca3eeb7b4f271bc91ec4ff57eb02a | |
| parent | cbe6eb69c6bc0c28c2f8236e19dcf3b4d0ef85f2 (diff) | |
| download | ruby-f40f3508af395021691d3a5155c0426e033626bf.tar.gz ruby-f40f3508af395021691d3a5155c0426e033626bf.tar.xz ruby-f40f3508af395021691d3a5155c0426e033626bf.zip | |
* vm.c (ruby_vm_destruct, thread_memsize): fix argument type to make
RUBY_MARK_FREE_DEBUG available.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25908 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | vm.c | 7 |
2 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Tue Nov 24 22:31:44 2009 Yusuke Endoh <mame@tsg.ne.jp> + + * vm.c (ruby_vm_destruct, thread_memsize): fix argument type to make + RUBY_MARK_FREE_DEBUG available. + Tue Nov 24 21:25:21 2009 Tanaka Akira <akr@fsij.org> * error.c: include errno.h at beginning. @@ -1480,10 +1480,11 @@ rb_vm_mark(void *ptr) #define vm_free 0 int -ruby_vm_destruct(rb_vm_t *vm) +ruby_vm_destruct(void *ptr) { RUBY_FREE_ENTER("vm"); - if (vm) { + if (ptr) { + rb_vm_t *vm = ptr; rb_thread_t *th = vm->main_thread; #if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE struct rb_objspace *objspace = vm->objspace; @@ -1688,8 +1689,6 @@ thread_free(void *ptr) static size_t thread_memsize(const void *ptr) { - RUBY_FREE_ENTER("thread"); - if (ptr) { const rb_thread_t *th = ptr; size_t size = sizeof(rb_thread_t); |
