diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-07 21:17:32 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-07 21:17:32 +0000 |
| commit | c832cd33eec470d8f013ac466e15e5624220c572 (patch) | |
| tree | 755371d7c5972165854b3f322ccd09f1a7ce2abb /channels/chan_sip.c | |
| parent | 670c39ec0622afe0888d0c54f39b3319a2cbf691 (diff) | |
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
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 4 |
1 files changed, 0 insertions, 4 deletions
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" |