From c0f41df0a00631fb204617f75cb1dc5447c814f1 Mon Sep 17 00:00:00 2001
From: tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Thu, 7 Jan 2010 21:17:03 +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.0@238494 f38db490-d61c-443f-a65b-d21fe96a405b
---
 main/poll.c | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'main')

diff --git a/main/poll.c b/main/poll.c
index bb93125a6..62e681dca 100644
--- 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
 \*---------------------------------------------------------------------------*/
-- 
cgit v1.2.3