[Asterisk-cvs] asterisk Makefile,1.125,1.126 config.c,1.40,1.41

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv5130

Modified Files:
	Makefile config.c 
Log Message:
Merge twisted's OSX compat fix (bug #3090)


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- Makefile	14 Dec 2004 23:36:29 -0000	1.125
+++ Makefile	19 Dec 2004 17:33:19 -0000	1.126
@@ -207,6 +207,7 @@
 endif
 ifeq (${OSARCH},Darwin)
 LIBS+=-lresolv
+CFLAGS+=-D__OSX__
 endif
 ifeq (${OSARCH},FreeBSD)
 LIBS+=-lcrypto

Index: config.c
===================================================================
RCS file: /usr/cvsroot/asterisk/config.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- config.c	15 Dec 2004 16:01:13 -0000	1.40
+++ config.c	19 Dec 2004 17:33:19 -0000	1.41
@@ -19,6 +19,9 @@
 #include <time.h>
 #define AST_INCLUDE_GLOB 1
 #ifdef AST_INCLUDE_GLOB
+#ifdef __OSX__
+#define GLOB_ABORTED GLOB_ABEND
+#endif
 # include <glob.h>
 #endif
 #include <asterisk/config.h>