From 273c4d116b1f6ac393b4fd34895f59b24045cfd9 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 17 Sep 2005 16:10:53 +0000
Subject: [PATCH] * gc.c (garbage_collect): return false if no GC run.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9203 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 8 ++++++--
 gc.c      | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 84768b5b47..075d04cd04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Sep 18 01:10:37 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (garbage_collect): return false if no GC run.
+
 Sat Sep 17 23:25:04 2005  sheepman  <sheepman@sheepman.sakura.ne.jp>
 
 	* lib/mathn.rb (Rational::inspect): should preserve original
@@ -67,8 +71,8 @@ Sat Sep 17 11:24:16 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 Sat Sep 17 10:42:13 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string and bg_eval_string
-	  should call Kernel.eval on caller's safe-level instead of slave's 
-	  safe-level (Of course, the given script should be evaluated on 
+	  should call Kernel.eval on caller's safe-level instead of slave's
+	  safe-level (Of course, the given script should be evaluated on
 	  slave's safe-level).
 
 Sat Sep 17 09:45:26 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
diff --git a/gc.c b/gc.c
index 11895c2123..ed006e17d6 100644
--- a/gc.c
+++ b/gc.c
@@ -1267,7 +1267,7 @@ garbage_collect(void)
 	}
 	return Qfalse;
     }
-    if (during_gc) return;
+    if (during_gc) return Qfalse;
     during_gc++;
 
     init_mark_stack();