aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xChangeLog2
-rwxr-xr-xMakefile2
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d563e5bcb..e793f126e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2005-11-21 Russell Bryant <russell@digium.com>
+ * Makefile: Revert previous change for Darwin.
+
* apps/app_osplookup.c: Properly populate the number of results. (issue #5789)
* Makefile: Don't hard-code that poll functionality needs to be provided on Darwin.
diff --git a/Makefile b/Makefile
index 82d20748f..039609233 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