From: Automerge script <automerge@asterisk.org>
Date: Thu, 16 Mar 2006 21:05:36 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.6-netsec~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe83f9421b0afb71344db9b7d033000d4811691a;p=thirdparty%2Fasterisk.git

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 adc58e74d2..38c7200be0 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 ef3289bc11..728800d27d 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