diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-07 21:17:03 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-07 21:17:03 +0000 |
| commit | c0f41df0a00631fb204617f75cb1dc5447c814f1 (patch) | |
| tree | a11f690941fd89fbe72b076a18eca91fcead5f50 /main | |
| parent | 91442293719fefd7639e06bc97a8e31212dd473c (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.0@238494 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/poll.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/main/poll.c b/main/poll.c index bb93125a6..62e681dca 100644 --- a/main/poll.c +++ b/main/poll.c @@ -84,14 +84,6 @@ #ifdef AST_POLL_COMPAT /*---------------------------------------------------------------------------*\ - Macros -\*---------------------------------------------------------------------------*/ - -#ifndef MAX -#define MAX(a,b) ((a) > (b) ? (a) : (b)) -#endif - -/*---------------------------------------------------------------------------*\ Private Functions \*---------------------------------------------------------------------------*/ |