Merge new change

1 files changed, 4 insertions, 4 deletions

diff --git a/src/etc.c b/src/etc.c
index c38f2a0bc..4542c4abd 100644
--- a/src/etc.c
+++ b/src/etc.c
@@ -25,7 +25,7 @@ mrb_data_object_alloc(mrb_state *mrb, struct RClass *klass, void *ptr, const str
 void *
 mrb_get_datatype(mrb_state *mrb, mrb_value obj, const struct mrb_data_type *type)
 {
-  if (SPECIAL_CONST_P(obj) || (mrb_type(obj) != MRB_TT_DATA)) {
+  if (mrb_special_const_p(obj) || (mrb_type(obj) != MRB_TT_DATA)) {
     return NULL;
   }
   if (DATA_TYPE(obj) != type) {
@@ -39,7 +39,7 @@ mrb_check_datatype(mrb_state *mrb, mrb_value obj, const struct mrb_data_type *ty
 {
   static const char mesg[] = "wrong argument type %s (expected %s)";
 
-  if (SPECIAL_CONST_P(obj) || (mrb_type(obj) != MRB_TT_DATA)) {
+  if (mrb_special_const_p(obj) || (mrb_type(obj) != MRB_TT_DATA)) {
     mrb_check_type(mrb, obj, MRB_TT_DATA);
   }
   if (DATA_TYPE(obj) != type) {
@@ -103,7 +103,7 @@ mrb_to_id(mrb_state *mrb, mrb_value name)
       name = mrb_str_intern(mrb, name);
       /* fall through */
     case MRB_TT_SYMBOL:
-      return SYM2ID(name);
+      return mrb_symbol(name);
   }
   return id;
 }
@@ -156,7 +156,7 @@ mrb_obj_id(mrb_value obj)
   case  MRB_TT_TRUE:
     return MakeID(1);
   case  MRB_TT_SYMBOL:
-    return MakeID(SYM2ID(obj));
+    return MakeID(mrb_symbol(obj));
   case  MRB_TT_FIXNUM:
     return MakeID2(float_id((mrb_float)mrb_fixnum(obj)), MRB_TT_FLOAT);
   case  MRB_TT_FLOAT: