rename ARGS_GETXXX macros to avoid potential name conflict; close #1206

2 files changed, 10 insertions, 10 deletions

diff --git a/include/mruby/proc.h b/include/mruby/proc.h
index 745d56b6b..4f1b6509f 100644
--- a/include/mruby/proc.h
+++ b/include/mruby/proc.h
@@ -31,13 +31,13 @@ struct RProc {
 };
 
 /* aspec access */
-#define ARGS_GETREQ(a)          (((a) >> 19) & 0x1f)
-#define ARGS_GETOPT(a)          (((a) >> 14) & 0x1f)
-#define ARGS_GETREST(a)         ((a) & (1<<13))
-#define ARGS_GETPOST(a)         (((a) >> 8) & 0x1f)
-#define ARGS_GETKEY(a)          (((a) >> 3) & 0x1f))
-#define ARGS_GETKDICT(a)        ((a) & (1<<2))
-#define ARGS_GETBLOCK(a)        ((a) & (1<<1))
+#define MRB_ARGS_REQ(a)          (((a) >> 19) & 0x1f)
+#define MRB_ARGS_OPT(a)          (((a) >> 14) & 0x1f)
+#define MRB_ARGS_REST(a)         ((a) & (1<<13))
+#define MRB_ARGS_POST(a)         (((a) >> 8) & 0x1f)
+#define MRB_ARGS_KEY(a)          (((a) >> 3) & 0x1f))
+#define MRB_ARGS_KDICT(a)        ((a) & (1<<2))
+#define MRB_ARGS_BLOCK(a)        ((a) & (1<<1))
 
 #define MRB_PROC_CFUNC 128
 #define MRB_PROC_CFUNC_P(p) ((p)->flags & MRB_PROC_CFUNC)
diff --git a/src/proc.c b/src/proc.c
index 8ddb06695..69a2d4449 100644
--- a/src/proc.c
+++ b/src/proc.c
@@ -140,9 +140,9 @@ mrb_proc_arity(mrb_state *mrb, mrb_value self)
   mrb_aspec aspec = *iseq >> 6;
   int ma, ra, pa, arity;
   
-  ma = ARGS_GETREQ(aspec);
-  ra = ARGS_GETREST(aspec);
-  pa = ARGS_GETPOST(aspec);
+  ma = MRB_ARGS_REQ(aspec);
+  ra = MRB_ARGS_REST(aspec);
+  pa = MRB_ARGS_POST(aspec);
   arity = ra ? -(ma + pa + 1) : ma + pa;
 
   return mrb_fixnum_value(arity);