summaryrefslogtreecommitdiff
path: root/gc.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-25 16:18:18 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-25 16:18:18 +0000
commitb58e36da4aaddd8d62c8750c1727c5849c56dc89 (patch)
tree88df7585dc5b15aad5b0db5fcc87c7f98fe9517b /gc.c
parentf0ca4e868d1385282195ab8103b980e947690aef (diff)
* include/ruby/ruby.h (ROBJECT_NUMIV): renamed from ROBJECT_LEN.
(ROBJECT_IVPTR): renamed from ROBJECT_PTR. * variable.c: follow the above renaming. * object.c: ditto. * gc.c: ditto. * marshal.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r--gc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gc.c b/gc.c
index 849c15ff69..3ff432fcda 100644
--- a/gc.c
+++ b/gc.c
@@ -1065,8 +1065,8 @@ gc_mark_children(VALUE ptr, int lev)
case T_OBJECT:
{
- long i, len = ROBJECT_LEN(obj);
- VALUE *ptr = ROBJECT_PTR(obj);
+ long i, len = ROBJECT_NUMIV(obj);
+ VALUE *ptr = ROBJECT_IVPTR(obj);
for (i = 0; i < len; i++) {
gc_mark(*ptr++, lev);
}
@@ -1274,8 +1274,8 @@ obj_free(VALUE obj)
switch (RANY(obj)->as.basic.flags & T_MASK) {
case T_OBJECT:
if (!(RANY(obj)->as.basic.flags & ROBJECT_EMBED) &&
- RANY(obj)->as.object.as.heap.ptr) {
- RUBY_CRITICAL(free(RANY(obj)->as.object.as.heap.ptr));
+ RANY(obj)->as.object.as.heap.ivptr) {
+ RUBY_CRITICAL(free(RANY(obj)->as.object.as.heap.ivptr));
}
break;
case T_MODULE: