3 files changed, 5 insertions, 4 deletions
diff --git a/include/mruby.h b/include/mruby.h
index 1054fd639..d98d29dbc 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -232,11 +232,11 @@ int mrb_gc_arena_save(mrb_state*);
 void mrb_gc_arena_restore(mrb_state*,int);
 void mrb_gc_mark(mrb_state*,struct RBasic*);
 #define mrb_gc_mark_value(mrb,val) do {\
-  if (mrb_type(val) >= MRB_TT_OBJECT) mrb_gc_mark((mrb), mrb_object(val));\
+  if (mrb_type(val) >= MRB_TT_OBJECT) mrb_gc_mark((mrb), mrb_basic(val));\
 } while (0)
 void mrb_field_write_barrier(mrb_state *, struct RBasic*, struct RBasic*);
 #define mrb_field_write_barrier_value(mrb, obj, val) do{\
-  if ((val.tt >= MRB_TT_OBJECT)) mrb_field_write_barrier((mrb), (obj), mrb_object(val));\
+  if ((val.tt >= MRB_TT_OBJECT)) mrb_field_write_barrier((mrb), (obj), mrb_basic(val));\
 } while (0)
 void mrb_write_barrier(mrb_state *, struct RBasic*);
 
diff --git a/include/mruby/class.h b/include/mruby/class.h
index e2f1bae46..c303db9ae 100644
--- a/include/mruby/class.h
+++ b/include/mruby/class.h
@@ -42,7 +42,7 @@ mrb_class(mrb_state *mrb, mrb_value v)
   case MRB_TT_MAIN:
     return mrb->object_class;
   default:
-    return mrb_object(v)->c;
+    return mrb_obj_ptr(v)->c;
   }
 }
 
diff --git a/include/mruby/value.h b/include/mruby/value.h
index 1dfa7b975..7a456ca0f 100644
--- a/include/mruby/value.h
+++ b/include/mruby/value.h
@@ -144,7 +144,6 @@ mrb_float_value(mrb_float f)
 
 #define mrb_fixnum(o) (o).value.i
 #define mrb_symbol(o) (o).value.sym
-#define mrb_object(o) ((struct RBasic *) (o).value.p)
 #define mrb_voidp(o) (o).value.p
 #define mrb_fixnum_p(o) (mrb_type(o) == MRB_TT_FIXNUM)
 #define mrb_float_p(o) (mrb_type(o) == MRB_TT_FLOAT)
@@ -195,6 +194,8 @@ struct RObject {
 };
 
 #define mrb_obj_ptr(v)   ((struct RObject*)((v).value.p))
+/* obsolete macro mrb_object; will be removed soon */
+#define mrb_object(o) mrb_obj_ptr(o)
 #define mrb_immediate_p(x) (mrb_type(x) <= MRB_TT_MAIN)
 #define mrb_special_const_p(x) mrb_immediate_p(x)