summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-17 16:10:53 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-17 16:10:53 +0000
commitf42144757b79cace2e21b6aad50c8a450a0ab4b7 (patch)
treec78dc9d8facf7211a6abbaea29f030c0806e64bf
parentd574f838a6bd1973d2c31968549af6fc94d12227 (diff)
downloadruby-f42144757b79cace2e21b6aad50c8a450a0ab4b7.tar.gz
ruby-f42144757b79cace2e21b6aad50c8a450a0ab4b7.tar.xz
ruby-f42144757b79cace2e21b6aad50c8a450a0ab4b7.zip
* gc.c (garbage_collect): return false if no GC run.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9203 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--gc.c2
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 84768b5b4..075d04cd0 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 11895c212..ed006e17d 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();