diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-12-19 17:33:19 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-12-19 17:33:19 +0000 |
commit | c6a32dbd844f0a939bde3fb41f1b074d1a45d9cf (patch) | |
tree | 5cc01c34b1644be4fed366859b76608af13b3a1c | |
parent | 62d1e370abe29aae5e494f2b24468980ec64c361 (diff) |
Merge twisted's OSX compat fix (bug #3090)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4483 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | Makefile | 1 | ||||
-rwxr-xr-x | config.c | 3 | ||||
-rwxr-xr-x | pbx/pbx_dundi.c | 4 |
3 files changed, 6 insertions, 2 deletions
@@ -207,6 +207,7 @@ LIBS+=-lresolv #-lnjamd endif ifeq (${OSARCH},Darwin) LIBS+=-lresolv +CFLAGS+=-D__OSX__ endif ifeq (${OSARCH},FreeBSD) LIBS+=-lcrypto @@ -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> diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index b68a1050a..602d05605 100755 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -39,7 +39,7 @@ #include <sys/socket.h> #include <string.h> #include <errno.h> -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(SOLARIS) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(SOLARIS) || defined(__OSX__) #include <sys/types.h> #include <netinet/in_systm.h> #endif @@ -47,7 +47,7 @@ #include <sys/ioctl.h> #include <netinet/in.h> #include <net/if.h> -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OSX__) #include <net/if_dl.h> #include <ifaddrs.h> #endif |