From 64fc4ac332eab0be7704cf6f7ec5a96c523c0ed9 Mon Sep 17 00:00:00 2001
From: Yukihiro Matsumoto <matz@ruby-lang.org>
Date: Thu, 31 May 2012 15:32:38 +0900
Subject: resolve conflict

---
 src/gc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/gc.c')

diff --git a/src/gc.c b/src/gc.c
index 999a1a7d2..536dbbbe6 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -266,7 +266,7 @@ mrb_obj_alloc(mrb_state *mrb, enum mrb_vtype ttype, struct RClass *cls)
   mrb->live++;
   if (mrb->arena_idx > MRB_ARENA_SIZE) {
     /* arena overflow error */
-    mrb->arena_idx = MRB_ARENA_SIZE - 2; /* force room in arena */
+    mrb->arena_idx = MRB_ARENA_SIZE - 4; /* force room in arena */
     mrb_raise(mrb, mrb->eRuntimeError_class, "arena overflow error");
   }
   mrb->arena[mrb->arena_idx++] = p;
@@ -360,12 +360,14 @@ gc_mark_children(mrb_state *mrb, struct RBasic *obj)
 
   case MRB_TT_STRING:
     {
+#if 0
       struct RString *s = (struct RString*)obj;
 
       while (s->flags & MRB_STR_SHARED) {
         s = s->aux.shared;
         if (!s) break;
       }
+#endif
     }
     break;
 
-- 
cgit v1.2.3