diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-04 15:44:14 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-04 15:44:14 +0000 |
commit | 6c6c4ed386df26894ee90d52fda4ba8c2b8c788c (patch) | |
tree | f162578b4f4db311cb01a087e412ca2a84c24d63 /apps | |
parent | 49dd9d666f69ad628f343457eabd18a0da4c5eba (diff) |
Enhancements for zaptel+bsd (bug #1781)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3143 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rwxr-xr-x | apps/Makefile | 1 | ||||
-rwxr-xr-x | apps/app_flash.c | 4 | ||||
-rwxr-xr-x | apps/app_intercom.c | 5 | ||||
-rwxr-xr-x | apps/app_meetme.c | 6 | ||||
-rwxr-xr-x | apps/app_rpt.c | 5 | ||||
-rwxr-xr-x | apps/app_zapbarge.c | 7 | ||||
-rwxr-xr-x | apps/app_zapras.c | 4 | ||||
-rwxr-xr-x | apps/app_zapscan.c | 7 |
8 files changed, 34 insertions, 5 deletions
diff --git a/apps/Makefile b/apps/Makefile index a51f5a036..5ff4a69cc 100755 --- a/apps/Makefile +++ b/apps/Makefile @@ -38,6 +38,7 @@ endif #APPS+=app_rpt.so APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) +APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) CFLAGS+=-fPIC diff --git a/apps/app_flash.c b/apps/app_flash.c index 902b7506c..45d1e25cf 100755 --- a/apps/app_flash.c +++ b/apps/app_flash.c @@ -21,7 +21,11 @@ #include <asterisk/image.h> #include <asterisk/options.h> #include <sys/ioctl.h> +#ifdef __linux__ #include <linux/zaptel.h> +#else +#include <zaptel.h> +#endif /* __linux__ */ #include <string.h> #include <errno.h> #include <stdlib.h> diff --git a/apps/app_intercom.c b/apps/app_intercom.c index 1652aaa0b..a4d863697 100755 --- a/apps/app_intercom.c +++ b/apps/app_intercom.c @@ -26,14 +26,15 @@ #include <stdlib.h> #include <pthread.h> #include <sys/time.h> -#ifdef __linux__ +#include <netinet/in.h> + +#if defined(__linux__) #include <linux/soundcard.h> #elif defined(__FreeBSD__) #include <sys/soundcard.h> #else #include <soundcard.h> #endif -#include <netinet/in.h> #ifdef __OpenBSD__ #define DEV_DSP "/dev/audio" diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 98b423734..591ea5af8 100755 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -31,9 +31,13 @@ #include <errno.h> #include <stdlib.h> #include <sys/ioctl.h> - #include <pthread.h> + +#ifdef __linux__ #include <linux/zaptel.h> +#else +#include <zaptel.h> +#endif /* __linux__ */ static char *tdesc = "MeetMe conference bridge"; diff --git a/apps/app_rpt.c b/apps/app_rpt.c index 9325d39ba..e6973725c 100755 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -61,7 +61,12 @@ enum {REM_OFF,REM_MONITOR,REM_TX}; #include <sys/ioctl.h> #include <math.h> #include <tonezone.h> + +#ifdef __linux__ #include <linux/zaptel.h> +#else +#include <zaptel.h> +#endif /* __linux__ */ static char *tdesc = "Radio Repeater / Remote Base version 0.2 05/30/2004"; static int debug = 0; diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c index 1dd9dd3bc..6d455ce4a 100755 --- a/apps/app_zapbarge.c +++ b/apps/app_zapbarge.c @@ -32,9 +32,14 @@ #include <string.h> #include <stdlib.h> #include <sys/ioctl.h> - #include <pthread.h> + +#ifdef __linux__ #include <linux/zaptel.h> +#else +#include <zaptel.h> +#endif /* __linux__ */ + static char *tdesc = "Barge in on Zap channel application"; static char *app = "ZapBarge"; diff --git a/apps/app_zapras.c b/apps/app_zapras.c index 9d88a06e3..b1cc5fbe0 100755 --- a/apps/app_zapras.c +++ b/apps/app_zapras.c @@ -33,7 +33,11 @@ #include <pthread.h> /* Need some zaptel help here */ +#ifdef __linux__ #include <linux/zaptel.h> +#else +#include <zaptel.h> +#endif /* __linux__ */ static char *tdesc = "Zap RAS Application"; diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c index 58a456f38..f449c7f36 100755 --- a/apps/app_zapscan.c +++ b/apps/app_zapscan.c @@ -33,9 +33,14 @@ #include <string.h> #include <stdlib.h> #include <sys/ioctl.h> - #include <pthread.h> + +#ifdef __linux__ #include <linux/zaptel.h> +#else +#include <zaptel.h> +#endif /* __linux__ */ + static char *tdesc = "Scan Zap channels application"; static char *app = "ZapScan"; |