Merge pull request #199 from masamitsu-murase/remove_conflicts_of_definition

Remove conflicts of definition

src/parse.y

@@ -41,8 +41,13 @@ static void backref_error(parser_state *p, node *n);
 
 #define identchar(c) (isalnum(c) || (c) == '_' || !isascii(c))
 
+#ifndef TRUE
 #define TRUE  1
+#endif
+
+#ifndef FALSE
 #define FALSE 0
+#endif
 
 typedef unsigned int stack_type;
 

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)