[asterisk-commits] tilghman: branch 1.6.0 r240666 - in /branches/1.6.0: ./ main/poll.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Jan 15 18:43:11 2010
New Revision: 240666

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=240666
Log:
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
........

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

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

Modified: branches/1.6.0/main/poll.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/poll.c?view=diff&rev=240666&r1=240665&r2=240666
==============================================================================
--- branches/1.6.0/main/poll.c (original)
+++ branches/1.6.0/main/poll.c Fri Jan 15 18:43:11 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