[asterisk-commits] russell: branch russell/ast_channel_ao2 r184154 - in /team/russell/ast_channe...

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Mar 24 21:15:46 2009
New Revision: 184154

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=184154
Log:
sync with trunk

Modified:
    team/russell/ast_channel_ao2/   (props changed)
    team/russell/ast_channel_ao2/include/asterisk/compat.h
    team/russell/ast_channel_ao2/main/timing.c
    team/russell/ast_channel_ao2/utils/Makefile

Propchange: team/russell/ast_channel_ao2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar 24 21:15:46 2009
@@ -1,1 +1,1 @@
-/trunk:1-184145
+/trunk:1-184153

Modified: team/russell/ast_channel_ao2/include/asterisk/compat.h
URL: http://svn.digium.com/svn-view/asterisk/team/russell/ast_channel_ao2/include/asterisk/compat.h?view=diff&rev=184154&r1=184153&r2=184154
==============================================================================
--- team/russell/ast_channel_ao2/include/asterisk/compat.h (original)
+++ team/russell/ast_channel_ao2/include/asterisk/compat.h Tue Mar 24 21:15:46 2009
@@ -67,7 +67,7 @@
 #include <string.h>
 #endif
 
-#ifdef HAVE_SYS_POLL_H
+#ifndef AST_POLL_COMPAT
 #include <sys/poll.h>
 #else
 #include "asterisk/poll-compat.h"

Modified: team/russell/ast_channel_ao2/main/timing.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/ast_channel_ao2/main/timing.c?view=diff&rev=184154&r1=184153&r2=184154
==============================================================================
--- team/russell/ast_channel_ao2/main/timing.c (original)
+++ team/russell/ast_channel_ao2/main/timing.c Tue Mar 24 21:15:46 2009
@@ -290,7 +290,7 @@
 			.events = POLLIN | POLLPRI,
 		};
 
-		res = poll(&pfd, 1, 100);
+		res = ast_poll(&pfd, 1, 100);
 
 		if (res == 1) {
 			count++;

Modified: team/russell/ast_channel_ao2/utils/Makefile
URL: http://svn.digium.com/svn-view/asterisk/team/russell/ast_channel_ao2/utils/Makefile?view=diff&rev=184154&r1=184153&r2=184154
==============================================================================
--- team/russell/ast_channel_ao2/utils/Makefile (original)
+++ team/russell/ast_channel_ao2/utils/Makefile Tue Mar 24 21:15:46 2009
@@ -163,6 +163,11 @@
 	$(CMD_PREFIX) cp "$<" "$@"
 utils.o: ASTCFLAGS+=-DSTANDALONE
 
+poll.c: $(ASTTOPDIR)/main/poll.c
+	$(ECHO_PREFIX) echo "   [CP] $(subst $(ASTTOPDIR)/,,$<) -> $@"
+	$(CMD_PREFIX) cp "$<" "$@"
+poll.o: ASTCFLAGS+=-DSTANDALONE
+
 strings.c: $(ASTTOPDIR)/main/strings.c
 	$(ECHO_PREFIX) echo "   [CP] $(subst $(ASTTOPDIR)/,,$<) -> $@"
 	$(CMD_PREFIX) cp "$<" "$@"
@@ -179,12 +184,12 @@
 threadstorage.o: ASTCFLAGS+=-DSTANDALONE
 
 hashtest2.o: ASTCFLAGS+=-O0 -DSTANDALONE
-hashtest2: hashtest2.o md5.o utils.o strings.o astobj2.o sha1.o strcompat.o threadstorage.o clicompat.o
-
-hashtest: hashtest.o md5.o hashtab.o utils.o strings.o sha1.o strcompat.o threadstorage.o clicompat.o
+hashtest2: hashtest2.o md5.o utils.o strings.o astobj2.o sha1.o strcompat.o threadstorage.o clicompat.o poll.o
+
+hashtest: hashtest.o md5.o hashtab.o utils.o strings.o sha1.o strcompat.o threadstorage.o clicompat.o poll.o
 hashtest.o: ASTCFLAGS+=-O0 -DSTANDALONE
 
-refcounter: refcounter.o md5.o hashtab.o utils.o strings.o sha1.o strcompat.o threadstorage.o clicompat.o
+refcounter: refcounter.o md5.o hashtab.o utils.o strings.o sha1.o strcompat.o threadstorage.o clicompat.o poll.o
 refcounter.o: ASTCFLAGS+=-O0 -DSTANDALONE
 
 extconf.o: extconf.c