summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--vm.c7
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index cf6c907886..56671ef492 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/vm.c b/vm.c
index 2ff61aa645..fa028fd187 100644
--- a/vm.c
+++ b/vm.c
@@ -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);