diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-16 21:05:36 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-16 21:05:36 +0000 |
| commit | 9d7a1447fdf9d3c52b7ddd7125ac0fd27a5d2b14 (patch) | |
| tree | f727e0458a9d0268f25e7093565b8c4d43f5c880 | |
| parent | 916e8d6913aa5c794265d38a695fb30ad9ab14ca (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@13318 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | ast_expr2.c | 4 | ||||
| -rw-r--r-- | ast_expr2.y | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ast_expr2.c b/ast_expr2.c index adc58e74d..38c7200be 100644 --- a/ast_expr2.c +++ b/ast_expr2.c @@ -142,10 +142,10 @@ #include <asterisk/ast_expr.h> #include <asterisk/logger.h> -#ifdef LONG_LONG_MIN +#if defined(LONG_LONG_MIN) && !defined(QUAD_MIN) #define QUAD_MIN LONG_LONG_MIN #endif -#ifdef LONG_LONG_MAX +#if defined(LONG_LONG_MAX) && !defined(QUAD_MAX) #define QUAD_MAX LONG_LONG_MAX #endif diff --git a/ast_expr2.y b/ast_expr2.y index ef3289bc1..728800d27 100644 --- a/ast_expr2.y +++ b/ast_expr2.y @@ -29,10 +29,10 @@ #include <asterisk/ast_expr.h> #include <asterisk/logger.h> -#ifdef LONG_LONG_MIN +#if defined(LONG_LONG_MIN) && !defined(QUAD_MIN) #define QUAD_MIN LONG_LONG_MIN #endif -#ifdef LONG_LONG_MAX +#if defined(LONG_LONG_MAX) && !defined(QUAD_MAX) #define QUAD_MAX LONG_LONG_MAX #endif |