From 2f4ef95ae65490d180571b8563374c052cd2afd7 Mon Sep 17 00:00:00 2001 From: Masamitsu MURASE Date: Sun, 27 May 2012 23:05:43 +0900 Subject: Add 'ifndef/endif' to avoid conflict of 'TRUE' definition. --- src/parse.y | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/parse.y b/src/parse.y index 5924cd43c..887ba0134 100644 --- a/src/parse.y +++ b/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; -- cgit v1.2.3 From c8201aa7ce4745e4321f594fdaa7d7de294d5fd1 Mon Sep 17 00:00:00 2001 From: Masamitsu MURASE Date: Sun, 27 May 2012 23:07:20 +0900 Subject: Add "ifndef/endif" to avoid conflict of "MIN" and "MAX" definition. --- src/regint.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') 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) -- cgit v1.2.3