From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Sat, 16 Jan 2010 00:43:11 +0000 (+0000)
Subject: Merged revisions 239665 via svnmerge from
X-Git-Tag: 1.6.0.23~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed6edf6908e78446a1f81b2ca00c9b9849a259b0;p=thirdparty%2Fasterisk.git

Merged revisions 239665 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r239665 | oej | 2010-01-13 04:45:19 -0600 (Wed, 13 Jan 2010) | 2 lines

  MAX() moved to utils.h
........


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

diff --git a/main/poll.c b/main/poll.c
index 62e681dca8..e52c117094 100644
--- a/main/poll.c
+++ b/main/poll.c
@@ -79,6 +79,7 @@
 #include <assert.h>                          /* assertion macros */
 #include <string.h>                          /* string functions */
 
+#include "asterisk/utils.h"                            /* this package */
 #include "asterisk/poll-compat.h"                            /* this package */
 
 #ifdef AST_POLL_COMPAT