diff options
author | twisted <twisted@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-05-25 21:56:50 +0000 |
---|---|---|
committer | twisted <twisted@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-05-25 21:56:50 +0000 |
commit | 32019cad87c2a8280d567fb1ce42daf22f1e8ac8 (patch) | |
tree | d518b7331b298579f6b254f8a6b7b2203e825d88 | |
parent | c0b1230290fae7474d2fa0d2fdd30c9b05174f49 (diff) |
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)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5769 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | Makefile | 2 | ||||
-rwxr-xr-x | config.c | 2 | ||||
-rwxr-xr-x | pbx/pbx_dundi.c | 4 |
3 files changed, 4 insertions, 4 deletions
@@ -244,7 +244,7 @@ LIBS+=-lresolv #-lnjamd endif ifeq (${OSARCH},Darwin) LIBS+=-lresolv -CFLAGS+=-D__OSX__ +CFLAGS+=-D__Darwin__ endif ifeq (${OSARCH},FreeBSD) LIBS+=-lcrypto @@ -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> diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index 323449da0..c5deb503c 100755 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -38,7 +38,7 @@ #include <sys/socket.h> #include <string.h> #include <errno.h> -#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(SOLARIS) || defined(__OSX__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(SOLARIS) || defined(__Darwin__) #include <sys/types.h> #include <netinet/in_systm.h> #endif @@ -46,7 +46,7 @@ #include <sys/ioctl.h> #include <netinet/in.h> #include <net/if.h> -#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__OSX__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__) #include <net/if_dl.h> #include <ifaddrs.h> #endif |