mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-13 00:04:53 +00:00
Merge twisted's OSX compat fix (bug #3090)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4483 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
1
Makefile
1
Makefile
@@ -207,6 +207,7 @@ LIBS+=-lresolv #-lnjamd
|
||||
endif
|
||||
ifeq (${OSARCH},Darwin)
|
||||
LIBS+=-lresolv
|
||||
CFLAGS+=-D__OSX__
|
||||
endif
|
||||
ifeq (${OSARCH},FreeBSD)
|
||||
LIBS+=-lcrypto
|
||||
|
3
config.c
3
config.c
@@ -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>
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user