aboutsummaryrefslogtreecommitdiffstats
path: root/ast_expr2.y
diff options
context:
space:
mode:
authorroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-03-16 21:05:36 +0000
committerroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-03-16 21:05:36 +0000
commit9d7a1447fdf9d3c52b7ddd7125ac0fd27a5d2b14 (patch)
treef727e0458a9d0268f25e7093565b8c4d43f5c880 /ast_expr2.y
parent916e8d6913aa5c794265d38a695fb30ad9ab14ca (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@13318 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'ast_expr2.y')
-rw-r--r--ast_expr2.y4
1 files changed, 2 insertions, 2 deletions
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