automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@13318 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/ast_expr2.c b/ast_expr2.c
index adc58e74d2cbcfa10437812c1d02c2863d7f0fcb..38c7200be003bab5b2c55576be52601ed2c35ef7 100644 (file)
--- 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 ef3289bc11d68b6b940a7c3801f24cc9fb8dbcf0..728800d27de29195d97ff2e4233e72cb2dc4cec6 100644 (file)
--- 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