summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--gc.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 032f093b87..b18cb7ae11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 29 10:12:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * gc.c (GC_PROF_TIMER_STOP): regularize `marked' to suppress
+ warnings.
+
Sat May 29 09:34:32 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/ruby/envutil.rb: fix for --disable-gems.
diff --git a/gc.c b/gc.c
index 9cc371d7d0..e2a161cd7e 100644
--- a/gc.c
+++ b/gc.c
@@ -166,8 +166,8 @@ getrusage_time(void)
gc_time = getrusage_time() - gc_time;\
if (gc_time < 0) gc_time = 0;\
objspace->profile.record[count].gc_time = gc_time;\
- objspace->profile.record[count].is_marked = marked;\
- GC_PROF_SET_HEAP_INFO(objspace->profile.record[count]);\
+ objspace->profile.record[count].is_marked = !!(marked);\
+ GC_PROF_SET_HEAP_INFO(objspace->profile.record[count]);\
objspace->profile.count++;\
}\
} while(0)