Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv30795/channels
Modified Files:
Makefile chan_zap.c
Log Message:
more BSD portability fixes (issue #5155)
Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/Makefile,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- Makefile 31 Aug 2005 00:27:33 -0000 1.72
+++ Makefile 14 Sep 2005 01:10:20 -0000 1.73
@@ -92,7 +92,13 @@
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
Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.509
retrieving revision 1.510
diff -u -d -r1.509 -r1.510
--- chan_zap.c 13 Sep 2005 02:27:32 -0000 1.509
+++ chan_zap.c 14 Sep 2005 01:10:20 -0000 1.510
@@ -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__)
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
