[asterisk-commits] oej: branch 1.6.1 r239676 - in /branches/1.6.1: ./ main/poll.c

[SVN commits to the Asterisk project]

Author: oej
Date: Wed Jan 13 05:19:17 2010
New Revision: 239676

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=239676
Log:
Merged revisions 239665 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r239665 | oej | 2010-01-13 11:45:19 +0100 (Ons, 13 Jan 2010) | 2 lines

MAX() moved to utils.h

........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/poll.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/poll.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/poll.c?view=diff&rev=239676&r1=239675&r2=239676
==============================================================================
--- branches/1.6.1/main/poll.c (original)
+++ branches/1.6.1/main/poll.c Wed Jan 13 05:19:17 2010
@@ -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