2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 54505999de..b9887fec1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 10 17:14:01 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (RVALUE_PROMOTE): fix parameter name (`x' to `obj')
+	  and make it inline function (like RVALUE_PROMOTE).
+
 Mon Jun 10 16:22:50 2013  Koichi Sasada  <ko1@atdot.net>
 
 	* array.c (rb_ary_new_from_values): add assertion
diff --git a/gc.c b/gc.c
index 2a39022c95..772966b65f 100644
--- a/gc.c
+++ b/gc.c
@@ -516,11 +516,13 @@ RVALUE_PROMOTE(VALUE obj)
     }
 #endif
 }
-#define RVALUE_DEMOTE(x)      do{					\
-	FL_UNSET2((x), FL_OLDGEN);					\
-	CLEAR_IN_BITMAP(GET_HEAP_OLDGEN_BITS(obj), obj);		\
-    }while(0)
 
+static inline void
+RVALUE_DEMOTE(VALUE obj)
+{
+    FL_UNSET2(obj, FL_OLDGEN);
+    CLEAR_IN_BITMAP(GET_HEAP_OLDGEN_BITS(obj), obj);
+}
 #endif
 
 static void