Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv24143
Modified Files:
Tag: v1-2
ChangeLog Makefile
Log Message:
revert previous change for Darwin
Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.146.2.19
retrieving revision 1.146.2.20
diff -u -d -r1.146.2.19 -r1.146.2.20
--- ChangeLog 21 Nov 2005 13:40:34 -0000 1.146.2.19
+++ ChangeLog 21 Nov 2005 15:57:51 -0000 1.146.2.20
@@ -1,5 +1,7 @@
2005-11-21 Russell Bryant <[EMAIL PROTECTED]>
+ * 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.
Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.226.2.4
retrieving revision 1.226.2.5
diff -u -d -r1.226.2.4 -r1.226.2.5
--- Makefile 21 Nov 2005 13:23:53 -0000 1.226.2.4
+++ Makefile 21 Nov 2005 15:57:51 -0000 1.226.2.5
@@ -363,6 +363,8 @@
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
_______________________________________________
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
