[svn-commits] russell: branch 1.6.1 r184149 - in /branches/1.6.1: ./ include/asterisk/ main...

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Mar 24 20:55:16 2009
New Revision: 184149

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=184149
Log:
Merged revisions 184147 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r184147 | russell | 2009-03-24 20:42:10 -0500 (Tue, 24 Mar 2009) | 5 lines
  
  Fix build issues on Mac OSX.
  
  (closes issue #14714)
  Reported by: ygor
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/include/asterisk/compat.h
    branches/1.6.1/main/timing.c
    branches/1.6.1/utils/Makefile

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

Modified: branches/1.6.1/include/asterisk/compat.h
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/include/asterisk/compat.h?view=diff&rev=184149&r1=184148&r2=184149
==============================================================================
--- branches/1.6.1/include/asterisk/compat.h (original)
+++ branches/1.6.1/include/asterisk/compat.h Tue Mar 24 20:55:16 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: branches/1.6.1/main/timing.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/timing.c?view=diff&rev=184149&r1=184148&r2=184149
==============================================================================
--- branches/1.6.1/main/timing.c (original)
+++ branches/1.6.1/main/timing.c Tue Mar 24 20:55:16 2009
@@ -38,6 +38,7 @@
 #include "asterisk/time.h"
 #include "asterisk/heap.h"
 #include "asterisk/module.h"
+#include "asterisk/poll-compat.h"
 
 struct timing_holder {
 	/*! Do _not_ move this from the beginning of the struct. */
@@ -290,7 +291,7 @@
 			.events = POLLIN | POLLPRI,
 		};
 
-		res = poll(&pfd, 1, 100);
+		res = ast_poll(&pfd, 1, 100);
 
 		if (res == 1) {
 			count++;

Modified: branches/1.6.1/utils/Makefile
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/utils/Makefile?view=diff&rev=184149&r1=184148&r2=184149
==============================================================================
--- branches/1.6.1/utils/Makefile (original)
+++ branches/1.6.1/utils/Makefile Tue Mar 24 20:55:16 2009
@@ -143,6 +143,10 @@
 aelparse: LIBS+=-lm
 aelparse: aelparse.o aelbison.o pbx_ael.o hashtab.o ael_main.o ast_expr2f.o ast_expr2.o strcompat.o pval.o extconf.o
 
+poll.c: $(ASTTOPDIR)/main/poll.c
+	@cp "$<" "$@"
+poll.o: ASTCFLAGS+=-DSTANDALONE
+
 astobj2.c: $(ASTTOPDIR)/main/astobj2.c
 	@cp "$<" "$@"
 astobj2.o: ASTCFLAGS+=-DSTANDALONE
@@ -160,12 +164,12 @@
 threadstorage.o: ASTCFLAGS+=-DSTANDALONE
 
 hashtest2.o: ASTCFLAGS+=-O0 -DSTANDALONE
-hashtest2: hashtest2.o md5.o utils.o astobj2.o sha1.o strcompat.o threadstorage.o clicompat.o
-
-hashtest: hashtest.o md5.o hashtab.o utils.o sha1.o strcompat.o threadstorage.o clicompat.o
+hashtest2: hashtest2.o md5.o utils.o astobj2.o sha1.o strcompat.o threadstorage.o clicompat.o poll.o
+
+hashtest: hashtest.o md5.o hashtab.o utils.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 sha1.o strcompat.o threadstorage.o clicompat.o
+refcounter: refcounter.o md5.o hashtab.o utils.o sha1.o strcompat.o threadstorage.o clicompat.o poll.o
 refcounter.o: ASTCFLAGS+=-O0 -DSTANDALONE
 
 extconf.o: extconf.c