3 files changed, 8 insertions, 18 deletions
diff --git a/include/mruby.h b/include/mruby.h
index 1337d7285..480080e8b 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -99,7 +99,7 @@ struct mrb_context {
 };
 
 enum gc_state {
-  GC_STATE_NONE = 0,
+  GC_STATE_ROOT = 0,
   GC_STATE_MARK,
   GC_STATE_SWEEP
 };
diff --git a/include/mruby/array.h b/include/mruby/array.h
index 9f1ef4d2f..c984c16a7 100644
--- a/include/mruby/array.h
+++ b/include/mruby/array.h
@@ -34,6 +34,9 @@ struct RArray {
 #define RARRAY_LEN(a) (RARRAY(a)->len)
 #define RARRAY_PTR(a) (RARRAY(a)->ptr)
 #define MRB_ARY_SHARED      256
+#define ARY_SHARED_P(a) ((a)->flags & MRB_ARY_SHARED)
+#define ARY_SET_SHARED_FLAG(a) ((a)->flags |= MRB_ARY_SHARED)
+#define ARY_UNSET_SHARED_FLAG(a) ((a)->flags &= ~MRB_ARY_SHARED)
 
 void mrb_ary_decref(mrb_state*, mrb_shared_array*);
 MRB_API void mrb_ary_modify(mrb_state*, struct RArray*);
diff --git a/include/mruby/string.h b/include/mruby/string.h
index 70ace95ae..0bd4cfc0f 100644
--- a/include/mruby/string.h
+++ b/include/mruby/string.h
@@ -101,29 +101,16 @@ MRB_API mrb_value mrb_str_cat_str(mrb_state *mrb, mrb_value str, mrb_value str2)
 MRB_API mrb_value mrb_str_append(mrb_state *mrb, mrb_value str, mrb_value str2);
 
 MRB_API int mrb_str_cmp(mrb_state *mrb, mrb_value str1, mrb_value str2);
-MRB_API const char *mrb_str_to_cstr(mrb_state *mrb, mrb_value str);
+MRB_API char *mrb_str_to_cstr(mrb_state *mrb, mrb_value str);
 mrb_value mrb_str_pool(mrb_state *mrb, mrb_value str);
 mrb_int mrb_str_hash(mrb_state *mrb, mrb_value str);
 mrb_value mrb_str_dump(mrb_state *mrb, mrb_value str);
 mrb_value mrb_str_inspect(mrb_state *mrb, mrb_value str);
 
 /* For backward compatibility */
-static inline mrb_value
-mrb_str_cat2(mrb_state *mrb, mrb_value str, const char *ptr) {
-  return mrb_str_cat_cstr(mrb, str, ptr);
-}
-
-static inline mrb_value
-mrb_str_buf_cat(mrb_state *mrb, mrb_value str, const char *ptr, size_t len)
-{
-  return mrb_str_cat(mrb, str, ptr, len);
-}
-
-static inline mrb_value
-mrb_str_buf_append(mrb_state *mrb, mrb_value str, mrb_value str2)
-{
-  return mrb_str_cat_str(mrb, str, str2);
-}
+#define mrb_str_cat2(mrb, str, ptr) mrb_str_cat_cstr(mrb, str, ptr)
+#define mrb_str_buf_cat(mrb, str, ptr, len) mrb_str_cat(mrb, str, ptr, len)
+#define mrb_str_buf_append(mrb, str, str2) mrb_str_cat_str(mrb, str, str2)
 
 #if defined(__cplusplus)
 }  /* extern "C" { */