[asterisk-commits] russell: trunk r184147 - in /trunk: include/asterisk/compat.h utils/Makefile

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Mar 24 20:42:10 2009
New Revision: 184147

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=184147
Log:
Fix build issues on Mac OSX.

(closes issue #14714)
Reported by: ygor

Modified:
    trunk/include/asterisk/compat.h
    trunk/utils/Makefile

Modified: trunk/include/asterisk/compat.h
URL: http://svn.digium.com/svn-view/asterisk/trunk/include/asterisk/compat.h?view=diff&rev=184147&r1=184146&r2=184147
==============================================================================
--- trunk/include/asterisk/compat.h (original)
+++ trunk/include/asterisk/compat.h Tue Mar 24 20:42:10 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: trunk/utils/Makefile
URL: http://svn.digium.com/svn-view/asterisk/trunk/utils/Makefile?view=diff&rev=184147&r1=184146&r2=184147
==============================================================================
--- trunk/utils/Makefile (original)
+++ trunk/utils/Makefile Tue Mar 24 20:42:10 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