aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-06-04 15:44:14 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-06-04 15:44:14 +0000
commit6c6c4ed386df26894ee90d52fda4ba8c2b8c788c (patch)
treef162578b4f4db311cb01a087e412ca2a84c24d63 /res
parent49dd9d666f69ad628f343457eabd18a0da4c5eba (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 'res')
-rwxr-xr-xres/Makefile1
-rwxr-xr-xres/res_musiconhold.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/res/Makefile b/res/Makefile
index 242a06163..32e42a2e2 100755
--- a/res/Makefile
+++ b/res/Makefile
@@ -17,6 +17,7 @@ CRYPTO_LIBS=-lssl -lcrypto
CFLAGS+=
CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH")
+CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH")
#
# Work around buggy RedHat 9.0
#
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 06798c274..d6bc6c760 100755
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -37,7 +37,11 @@
#include <sys/stat.h>
#include <dirent.h>
#ifdef ZAPATA_MOH
+#ifdef __linux__
#include <linux/zaptel.h>
+#else
+#include <zaptel.h>
+#endif /* __linux__ */
#endif
#include <unistd.h>
#include <sys/ioctl.h>