aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortwisted <twisted@f38db490-d61c-443f-a65b-d21fe96a405b>2005-11-21 15:09:31 +0000
committertwisted <twisted@f38db490-d61c-443f-a65b-d21fe96a405b>2005-11-21 15:09:31 +0000
commitbd1c9ddc3b36b876baf1215c3ab2f6b3e0e4a05c (patch)
treed117ae04fe382245e79fb3e39e6c94e1fad1a559
parent4c7ca73ebaea2a28748983a6f3f5f1f8bbbe5660 (diff)
Re-add explicit poll support for Darwin, as without it, rasterisk (or asterisk -r) is broken under Darwin.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7172 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xChangeLog4
-rwxr-xr-xMakefile2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7675e7bea..91157642a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-21 Josh Roberson <josh@asteriasgi.com>
+
+ * Makefile: Re-fix Darwin poll issues.
+
2005-11-21 Russell Bryant <russell@digium.com>
* apps/app_osplookup.c: Properly populate the number of results. (issue #5789)
diff --git a/Makefile b/Makefile
index 82d20748f..69e57fea4 100755
--- a/Makefile
+++ b/Makefile
@@ -363,6 +363,8 @@ ifeq ($(OSARCH),Darwin)
AUDIO_LIBS=-framework CoreAudio
ASTLINK=-Wl,-dynamic
SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
+ OBJS+=poll.o
+ ASTCFLAGS+=-DPOLLCOMPAT
else
#These are used for all but Darwin
ASTLINK=-Wl,-E