summaryrefslogtreecommitdiff
path: root/cont.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-02 08:05:44 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-02 08:05:44 +0000
commit3bd554d393118fd5553157eabf746ebd72348291 (patch)
tree5db8c9e6a656d1e1ee47a0fc0955624233cbe209 /cont.c
parent404886ce6df6684fb1122c2c677601d875b684bd (diff)
merges r29406 from trunk into ruby_1_9_2.
-- * cont.c (fiber_memsize): Return size. Before this change, fiber_memsize always returns 0. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30027 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'cont.c')
-rw-r--r--cont.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cont.c b/cont.c
index 294a197f7f..ff7cfd50e9 100644
--- a/cont.c
+++ b/cont.c
@@ -221,7 +221,7 @@ fiber_memsize(const void *ptr)
}
size += cont_memsize(&fib->cont);
}
- return 0;
+ return size;
}
static void