diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-09-14 01:10:20 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-09-14 01:10:20 +0000 |
commit | 06e6b25ca44f1612b599b7f89d33367be9bd72b5 (patch) | |
tree | ad1888e09a9c859f58860502d550d21def10ed68 /channels | |
parent | 664813210f2945e02f5502d9ce9ea4b6186bd18a (diff) |
more BSD portability fixes (issue #5155)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6578 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rwxr-xr-x | channels/Makefile | 8 | ||||
-rwxr-xr-x | channels/chan_zap.c | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/channels/Makefile b/channels/Makefile index 2bfd2308a..7189416bd 100755 --- a/channels/Makefile +++ b/channels/Makefile @@ -92,7 +92,13 @@ ifneq ($(wildcard alsa-monitor.h),) ALSA_SRC+=alsa-monitor.h endif -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),) +ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) + ifeq (${OSARCH},NetBSD) + SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib + endif + ifeq (${OSARCH},FreeBSD) + SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib + endif CFLAGS+=-DIAX_TRUNKING CHANNEL_LIBS+=chan_zap.so endif diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 44b3fe1e8..d403bfbcc 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -13,7 +13,12 @@ #include <stdio.h> #include <string.h> +#ifdef __NetBSD__ +#include <pthread.h> +#include <signal.h> +#else #include <sys/signal.h> +#endif #include <errno.h> #include <stdlib.h> #if !defined(SOLARIS) && !defined(__FreeBSD__) |