]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 239665 via svnmerge from
authorOlle Johansson <oej@edvina.net>
Wed, 13 Jan 2010 11:19:17 +0000 (11:19 +0000)
committerOlle Johansson <oej@edvina.net>
Wed, 13 Jan 2010 11:19:17 +0000 (11:19 +0000)
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

........

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

main/poll.c

index 62e681dca872a2f24b16e21741f4f1fa83a13acd..e52c117094f4d9dab9a891b21a66fe311e7e091a 100644 (file)
@@ -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