From 43866b0ef2a0bc117edfad7c3c58c129ffc543bb Mon Sep 17 00:00:00 2001
From: Josh Roberson <josh@asteriasgi.com>
Date: Wed, 25 May 2005 21:56:50 +0000
Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/trunk@5769 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
Makefile | 2 +-
config.c | 2 +-
pbx/pbx_dundi.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 95f4ef007f..3b6b4cb00a 100755
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/config.c b/config.c
index b375669910..d8675e27cb 100755
--- a/config.c
+++ b/config.c
@@ -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 323449da02..c5deb503c5 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
--
GitLab