Define side-effect-safe MIN and MAX macros and remove duplicate definitions from...

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@209400 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index 48d718682eb26e76ec240f3e333ebd1d9af4325d..ffc62c8b1c0d1550e41fcee070d8c0888f49604b 100644 (file)
--- 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, const struct
 
 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 55be76895c0c6b2c1e89d6abc209bf784d5e0c32..836895ac0bc8667f03142f42411927f98de02b9c 100644 (file)
--- 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 9b2201a48ed578aad26b4fd7d3b729a573ae97e6..a58c4b6d472dca5d68ced519e6eb1f9c5c0c1243 100644 (file)
--- 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 4d89ae03cb68442797f209b102a5fdf69a389ebd..6b9f39a14bb5ea68dbe5032ab4af2620f093fd06 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -557,10 +557,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #define TRUE     1
 #endif
 
-#ifndef MAX
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
 /* Arguments for find_peer */
 #define FINDUSERS (1 << 0)
 #define FINDPEERS (1 << 1)

diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c
index b8e9d70a979a473ed6ddc7627f6f28a26be1507d..dd19334832594f6f747595bb5877e04a9bfdec11 100644 (file)
--- 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 char *config = "usbradio.conf"; /* default config file */
 static char *config1 = "usbradio_tune_%s.conf";    /* tune config file */
 

diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h
index 6f9684409e6b714e3097c953e5524df7c4859b2c..0517485100ab8d5ac90667d30240bce4cd4d7473 100644 (file)
--- a/include/asterisk/utils.h
+++ b/include/asterisk/utils.h
@@ -222,6 +222,11 @@ void ast_sha1_hash(char *output, const char *input);
 
 int ast_base64encode_full(char *dst, const unsigned char *src, int srclen, int max, int linebreaks);
 
+#undef MIN
+#define MIN(a, b) ({ typeof(a) __a = (a); typeof(b) __b = (b); ((__a > __b) ? __b : __a);})
+#undef MAX
+#define MAX(a, b) ({ typeof(a) __a = (a); typeof(b) __b = (b); ((__a < __b) ? __b : __a);})
+
 /*!
  * \brief Encode data in base64
  * \param dst the destination buffer

diff --git a/main/poll.c b/main/poll.c
index bb93125a6b03a23285860b10674564a312919138..62e681dca872a2f24b16e21741f4f1fa83a13acd 100644 (file)
--- a/main/poll.c
+++ b/main/poll.c
@@ -83,14 +83,6 @@
 
 #ifdef AST_POLL_COMPAT
 
-/*---------------------------------------------------------------------------*\
-                                 Macros
-\*---------------------------------------------------------------------------*/
-
-#ifndef MAX
-#define MAX(a,b)       ((a) > (b) ? (a) : (b))
-#endif
-
 /*---------------------------------------------------------------------------*\
                             Private Functions
 \*---------------------------------------------------------------------------*/