summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2013-04-04 04:30:39 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2013-04-04 04:30:39 +0900
commit75f5535c4fcccb09006a1cd718a8096e96b0d7da (patch)
tree7e6e459eccb93d793a0b75355490e0d292c3309f /include
parentdfb4755729266e178394a6c45b08265d43886f58 (diff)
downloadmruby-75f5535c4fcccb09006a1cd718a8096e96b0d7da.tar.gz
mruby-75f5535c4fcccb09006a1cd718a8096e96b0d7da.zip
rename DATA API: mrb_get_datatype -> mrb_data_get_ptr; mrb_check_datatype -> mrb_data_check_and_get
Diffstat (limited to 'include')
-rw-r--r--include/mruby/data.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/include/mruby/data.h b/include/mruby/data.h
index 6ddaebfaa..2fffd0c69 100644
--- a/include/mruby/data.h
+++ b/include/mruby/data.h
@@ -37,10 +37,13 @@ struct RData *mrb_data_object_alloc(mrb_state *mrb, struct RClass* klass, void *
#define RDATA(obj) ((struct RData *)((obj).value.p))
#define DATA_PTR(d) (RDATA(d)->data)
#define DATA_TYPE(d) (RDATA(d)->type)
-void *mrb_get_datatype(mrb_state *mrb, mrb_value, const mrb_data_type*);
-void *mrb_check_datatype(mrb_state *mrb, mrb_value, const mrb_data_type*);
+void mrb_data_check_type(mrb_state *mrb, mrb_value, const mrb_data_type*);
+void *mrb_data_get_ptr(mrb_state *mrb, mrb_value, const mrb_data_type*);
+void *mrb_data_check_and_get(mrb_state *mrb, mrb_value, const mrb_data_type*);
+#define mrb_get_datatype(mrb,val,type) mrb_data_get_ptr(mrb, val, type)
+#define mrb_check_datatype(mrb,val,type) mrb_data_check_and_get(mrb, val, type)
#define Data_Get_Struct(mrb,obj,type,sval) do {\
- *(void**)&sval = mrb_check_datatype(mrb, obj, type); \
+ *(void**)&sval = mrb_data_check_and_get(mrb, obj, type); \
} while (0)
#if defined(__cplusplus)