summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-19 01:44:39 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-19 01:44:39 +0000
commit7d431933b65252109bde705391398126fb5930b9 (patch)
tree6dc7a6538fa72ea50681a4ecb13adcd2373d10c7
parentf14e2a074a34d5bbc4ee6f5ca51562b112e095f1 (diff)
* gc.c (garbage_collect_with_gvl): suppress warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21655 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--gc.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 072d18fd7b2..97d91c30556 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jan 19 10:43:38 2009 Koichi Sasada <ko1@atdot.net>
+
+ * gc.c (garbage_collect_with_gvl): suppress warnings.
+
Mon Jan 19 10:34:32 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/socket/depend: workaround for nmake. files in depend without
diff --git a/gc.c b/gc.c
index d56d2d170af..ab882c50de4 100644
--- a/gc.c
+++ b/gc.c
@@ -593,7 +593,7 @@ garbage_collect_with_gvl(rb_objspace_t *objspace)
}
else {
if (ruby_native_thread_p()) {
- return (int)rb_thread_call_with_gvl(gc_with_gvl, (void *)objspace);
+ return (VALUE)rb_thread_call_with_gvl(gc_with_gvl, (void *)objspace);
}
else {
/* no ruby thread */