summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMasamitsu MURASE <[email protected]>2012-05-27 23:07:20 +0900
committerMasamitsu MURASE <[email protected]>2012-05-27 23:07:20 +0900
commitc8201aa7ce4745e4321f594fdaa7d7de294d5fd1 (patch)
tree571891b69d44d31f5d1441cf2f882d4217debf4b /src
parent2f4ef95ae65490d180571b8563374c052cd2afd7 (diff)
downloadmruby-c8201aa7ce4745e4321f594fdaa7d7de294d5fd1.tar.gz
mruby-c8201aa7ce4745e4321f594fdaa7d7de294d5fd1.zip
Add "ifndef/endif" to avoid conflict of "MIN" and "MAX" definition.
Diffstat (limited to 'src')
-rw-r--r--src/regint.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/regint.h b/src/regint.h
index 23e3a8c05..aa4871594 100644
--- a/src/regint.h
+++ b/src/regint.h
@@ -222,8 +222,13 @@
#include "regenc.h"
+#ifndef MIN
#define MIN(a,b) (((a)>(b))?(b):(a))
+#endif
+
+#ifndef MAX
#define MAX(a,b) (((a)<(b))?(b):(a))
+#endif
#define IS_NULL(p) (((void*)(p)) == (void*)0)
#define IS_NOT_NULL(p) (((void*)(p)) != (void*)0)