Changeset 440 for EcnlProtoTool/trunk/mruby-2.1.1/include/mruby/proc.h

Timestamp:

Jul 9, 2020, 12:35:25 PM (4 years ago)

Author:

coas-nagasima

Message:

mrubyが不安なので、MRB_METHOD_T_STRUCTを指定

File:

• EcnlProtoTool/trunk/mruby-2.1.1/include/mruby/proc.h (modified) (1 diff)

EcnlProtoTool/trunk/mruby-2.1.1/include/mruby/proc.h

@@ -105 +105 @@
 #define MRB_METHOD_NOARG_P(m) (((uintptr_t)(m))&MRB_METHOD_NOARG_FL)
 #define MRB_METHOD_NOARG_SET(m) ((m)=(mrb_method_t)(((uintptr_t)(m))|MRB_METHOD_NOARG_FL))
-#define MRB_METHOD_FUNC(m) ((mrb_func_t)((uintptr_t)(m)&(~(MRB_METHOD_NOARG_FL|MRB_METHOD_FUNC_FL))))
-#define MRB_METHOD_FROM_FUNC(m,fn) ((m)=(mrb_method_t)((((uintptr_t)(fn))|MRB_METHOD_FUNC_FL)))
+#define MRB_METHOD_FUNC(m) ((mrb_func_t)((uintptr_t)(m)>>2))
+#define MRB_METHOD_FROM_FUNC(m,fn) ((m)=(mrb_method_t)((((uintptr_t)(fn))<<2)|MRB_METHOD_FUNC_FL))
 #define MRB_METHOD_FROM_PROC(m,pr) ((m)=(mrb_method_t)(pr))
 #define MRB_METHOD_PROC_P(m) (!MRB_METHOD_FUNC_P(m))