From c832cd33eec470d8f013ac466e15e5624220c572 Mon Sep 17 00:00:00 2001
From: tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Thu, 7 Jan 2010 21:17:32 +0000
Subject: Merged revisions 209400 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

........
  r209400 | kpfleming | 2009-07-28 08:49:46 -0500 (Tue, 28 Jul 2009) | 3 lines

  Define side-effect-safe MIN and MAX macros and remove duplicate definitions from various files.
  (closes issue #16251)
  Reported by: asgaroth
........


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@238497 f38db490-d61c-443f-a65b-d21fe96a405b
---
 channels/chan_alsa.c     | 3 ---
 channels/chan_console.c  | 7 -------
 channels/chan_oss.c      | 7 -------
 channels/chan_sip.c      | 4 ----
 channels/chan_usbradio.c | 7 -------
 5 files changed, 28 deletions(-)

(limited to 'channels')

diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index de726ac3f..c6814f4ad 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -591,9 +591,6 @@ static struct ast_channel *alsa_request(const char *type, int fmt, void *data, i
 
 static char *autoanswer_complete(const char *line, const char *word, int pos, int state)
 {
-#ifndef MIN
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#endif
 	switch (state) {
 		case 0:
 			if (!ast_strlen_zero(word) && !strncasecmp(word, "on", MIN(strlen(word), 2)))
diff --git a/channels/chan_console.c b/channels/chan_console.c
index b057580fb..4c9b91a91 100644
--- a/channels/chan_console.c
+++ b/channels/chan_console.c
@@ -101,13 +101,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
  */
 #define TEXT_SIZE	256
 
-#ifndef MIN
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#endif
-#ifndef MAX
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
 /*! \brief Dance, Kirby, Dance! @{ */
 #define V_BEGIN " --- <(\"<) --- "
 #define V_END   " --- (>\")> ---\n"
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index cc29608ca..d045e00c1 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -229,13 +229,6 @@ END_CONFIG
 #define DEV_DSP "/dev/dsp"
 #endif
 
-#ifndef MIN
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#endif
-#ifndef MAX
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
 static char *config = "oss.conf";	/* default config file */
 
 static int oss_debug;
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 6dbe3b300..ba9d92bca 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -243,10 +243,6 @@ static int min_expiry = DEFAULT_MIN_EXPIRY;        /*!< Minimum accepted registr
 static int max_expiry = DEFAULT_MAX_EXPIRY;        /*!< Maximum accepted registration time */
 static int default_expiry = DEFAULT_DEFAULT_EXPIRY;
 
-#ifndef MAX
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
 #define CALLERID_UNKNOWN             "Anonymous"
 #define FROMDOMAIN_INVALID           "anonymous.invalid"
 
diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c
index 312bc997b..bc77888d0 100644
--- a/channels/chan_usbradio.c
+++ b/channels/chan_usbradio.c
@@ -351,13 +351,6 @@ END_CONFIG
 #define DEV_DSP "/dev/dsp"
 #endif
 
-#ifndef MIN
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#endif
-#ifndef MAX
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
 static const char *config = "usbradio.conf";	/* default config file */
 #define config1 "usbradio_tune_%s.conf"    /* tune config file */
 
-- 
cgit v1.2.3