summaryrefslogtreecommitdiffhomepage
path: root/src/gc.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-08-04 16:28:02 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-08-04 16:28:02 +0900
commitea80e8285247992fc4308621571eed9a0e215184 (patch)
tree4fb483d7d65372558052cdc4baf378ac104e4116 /src/gc.c
parentdb7b01c0b360b2909b14dbd399ee5a3eb2fce0c5 (diff)
parent0fa3668e917c45409acd56ba624db24d95699895 (diff)
downloadmruby-ea80e8285247992fc4308621571eed9a0e215184.tar.gz
mruby-ea80e8285247992fc4308621571eed9a0e215184.zip
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'src/gc.c')
-rw-r--r--src/gc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gc.c b/src/gc.c
index 248c519cd..c8e7a4646 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -949,7 +949,7 @@ static void
incremental_gc_until(mrb_state *mrb, enum gc_state to_state)
{
do {
- incremental_gc(mrb, ~0);
+ incremental_gc(mrb, SIZE_MAX);
} while (mrb->gc_state != to_state);
}
@@ -1162,7 +1162,7 @@ gc_start(mrb_state *mrb, mrb_value obj)
static mrb_value
gc_enable(mrb_state *mrb, mrb_value obj)
{
- int old = mrb->gc_disabled;
+ mrb_bool old = mrb->gc_disabled;
mrb->gc_disabled = FALSE;
@@ -1184,7 +1184,7 @@ gc_enable(mrb_state *mrb, mrb_value obj)
static mrb_value
gc_disable(mrb_state *mrb, mrb_value obj)
{
- int old = mrb->gc_disabled;
+ mrb_bool old = mrb->gc_disabled;
mrb->gc_disabled = TRUE;
@@ -1258,7 +1258,7 @@ gc_step_ratio_set(mrb_state *mrb, mrb_value obj)
}
static void
-change_gen_gc_mode(mrb_state *mrb, mrb_int enable)
+change_gen_gc_mode(mrb_state *mrb, mrb_bool enable)
{
if (is_generational(mrb) && !enable) {
clear_all_old(mrb);