diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2012-05-27 16:17:23 -0700 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2012-05-27 16:17:23 -0700 |
| commit | 6fb45658ebe1fcd28dcc398c37fca46ee2e39754 (patch) | |
| tree | 571891b69d44d31f5d1441cf2f882d4217debf4b /src | |
| parent | 2a3e74b4fd2b9841dec5c082c3e8ecb9ad676821 (diff) | |
| parent | c8201aa7ce4745e4321f594fdaa7d7de294d5fd1 (diff) | |
| download | mruby-6fb45658ebe1fcd28dcc398c37fca46ee2e39754.tar.gz mruby-6fb45658ebe1fcd28dcc398c37fca46ee2e39754.zip | |
Merge pull request #199 from masamitsu-murase/remove_conflicts_of_definition
Remove conflicts of definition
Diffstat (limited to 'src')
| -rw-r--r-- | src/parse.y | 5 | ||||
| -rw-r--r-- | src/regint.h | 5 |
2 files changed, 10 insertions, 0 deletions
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; 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) |