kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-15 08:44:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge twisted's OSX compat fix (bug #3090)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4483 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-12-19 17:33:19 +00:00
parent 374c9c1789
commit 61f25c3e92
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -207,6 +207,7 @@ LIBS+=-lresolv #-lnjamd
endif endif
ifeq (${OSARCH},Darwin) ifeq (${OSARCH},Darwin)
LIBS+=-lresolv LIBS+=-lresolv
CFLAGS+=-D__OSX__
endif endif
ifeq (${OSARCH},FreeBSD) ifeq (${OSARCH},FreeBSD)
LIBS+=-lcrypto LIBS+=-lcrypto

3
config.c
View File

@@ -19,6 +19,9 @@
#include <time.h> #include <time.h>
#define AST_INCLUDE_GLOB 1 #define AST_INCLUDE_GLOB 1
#ifdef AST_INCLUDE_GLOB #ifdef AST_INCLUDE_GLOB
#ifdef __OSX__
#define GLOB_ABORTED GLOB_ABEND
#endif
# include <glob.h> # include <glob.h>
#endif #endif
#include <asterisk/config.h> #include <asterisk/config.h>

4
pbx/pbx_dundi.c
View File

@@ -39,7 +39,7 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <string.h> #include <string.h>
#include <errno.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 <sys/types.h>
#include <netinet/in_systm.h> #include <netinet/in_systm.h>
#endif #endif
@@ -47,7 +47,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <net/if.h> #include <net/if.h>
#if defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OSX__)
#include <net/if_dl.h> #include <net/if_dl.h>
#include <ifaddrs.h> #include <ifaddrs.h>
#endif #endif