From 2067adbe01b6e06b27b4c358496f72ce01092f83 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 15 Jan 2009 15:40:27 +0000
Subject: merges r21533 from trunk into ruby_1_9_1. * gc.c (gc_with_gvl):
 suppress warnings.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 4 ++++
 gc.c      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5b71f7d61..381cfa6b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jan 16 00:19:55 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_with_gvl): suppress warnings.
+
 Thu Jan 15 20:44:30 2009  Tanaka Akira  <akr@fsij.org>
 
 	* tool/file2lastrev.rb: RUBY_REVISION must be an integer.
diff --git a/gc.c b/gc.c
index 3d4144553..d56d2d170 100644
--- a/gc.c
+++ b/gc.c
@@ -582,7 +582,7 @@ negative_size_allocation_error(const char *msg)
 static void *
 gc_with_gvl(void *ptr)
 {
-    return (void *)garbage_collect((rb_objspace_t *)ptr);
+    return (void *)(VALUE)garbage_collect((rb_objspace_t *)ptr);
 }
 
 static int
-- 
cgit