rename mrb_basic to mrb_basic_ptr; close #1011

2 files changed, 5 insertions, 3 deletions

diff --git a/include/mruby.h b/include/mruby.h
index d98d29dbc..2d2bc64cc 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_basic(val));\
+  if (mrb_type(val) >= MRB_TT_OBJECT) mrb_gc_mark((mrb), mrb_basic_ptr(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_basic(val));\
+  if ((val.tt >= MRB_TT_OBJECT)) mrb_field_write_barrier((mrb), (obj), mrb_basic_ptr(val));\
 } while (0)
 void mrb_write_barrier(mrb_state *, struct RBasic*);
 
diff --git a/include/mruby/value.h b/include/mruby/value.h
index 7a456ca0f..7f31b0982 100644
--- a/include/mruby/value.h
+++ b/include/mruby/value.h
@@ -186,7 +186,9 @@ struct RBasic {
   MRB_OBJECT_HEADER;
 };
 
-#define mrb_basic(v)     ((struct RBasic*)((v).value.p))
+#define mrb_basic_ptr(v) ((struct RBasic*)((v).value.p))
+/* obsolete macro mrb_basic; will be removed soon */
+#define mrb_basic(v)     mrb_basic_ptr(v)
 
 struct RObject {
   MRB_OBJECT_HEADER;