[Asterisk-cvs] asterisk Makefile,1.160,1.161 config.c,1.63,1.64

[twisted at lists.digium.com]

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

Modified Files:
	Makefile config.c 
Log Message:
Change define __OSX__ to more appropriate __Darwin__ (in light of Darwin being open sourced, and able to run on x86, OSX isn't really suitable)


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- Makefile	20 May 2005 03:18:35 -0000	1.160
+++ Makefile	25 May 2005 21:56:50 -0000	1.161
@@ -244,7 +244,7 @@
 endif
 ifeq (${OSARCH},Darwin)
 LIBS+=-lresolv
-CFLAGS+=-D__OSX__
+CFLAGS+=-D__Darwin__
 endif
 ifeq (${OSARCH},FreeBSD)
 LIBS+=-lcrypto

Index: config.c
===================================================================
RCS file: /usr/cvsroot/asterisk/config.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- config.c	25 May 2005 10:57:15 -0000	1.63
+++ config.c	25 May 2005 21:56:50 -0000	1.64
@@ -19,7 +19,7 @@
 #include <time.h>
 #define AST_INCLUDE_GLOB 1
 #ifdef AST_INCLUDE_GLOB
-#ifdef __OSX__
+#ifdef __Darwin__
 #define GLOB_ABORTED GLOB_ABEND
 #endif
 # include <glob.h>