summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2008-06-25 23:05:28 +0000
committerKevin P. Fleming <kpfleming@digium.com>2008-06-25 23:05:28 +0000
commitfd4a60c4599189c2022f31bab18d03df39d3ea3e (patch)
tree4b50cc41540b7c5350a214a536d63dd9f03dd95e /apps
parent14e78bbc6df085815869c8fc1555cfd33ad7540e (diff)
Merged revisions 125132 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r125132 | kpfleming | 2008-06-25 17:21:30 -0500 (Wed, 25 Jun 2008) | 10 lines allow tonezone to live in a different place than DAHDI/Zaptel, since dahdi-tools and dahdi-linux are now separate packages and can be installed in different places don't include tonezone.h in dahdi_compat.h, because only a couple of modules need it get app_rpt building again after the DAHDI changes (closes issue #12911) Reported by: tzafrir ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@125138 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rw-r--r--apps/app_dahdibarge.c2
-rw-r--r--apps/app_dahdiras.c2
-rw-r--r--apps/app_dahdiscan.c2
-rw-r--r--apps/app_flash.c2
-rw-r--r--apps/app_meetme.c4
-rw-r--r--apps/app_rpt.c8
6 files changed, 8 insertions, 12 deletions
diff --git a/apps/app_dahdibarge.c b/apps/app_dahdibarge.c
index b70b57b30..6487a4ddb 100644
--- a/apps/app_dahdibarge.c
+++ b/apps/app_dahdibarge.c
@@ -39,7 +39,7 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include "asterisk/dahdi.h"
+#include <dahdi/user.h>
#include "asterisk/lock.h"
#include "asterisk/file.h"
diff --git a/apps/app_dahdiras.c b/apps/app_dahdiras.c
index 384607d98..4cc192604 100644
--- a/apps/app_dahdiras.c
+++ b/apps/app_dahdiras.c
@@ -43,7 +43,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <fcntl.h>
-#include "asterisk/dahdi.h"
+#include <dahdi/user.h>
#include "asterisk/lock.h"
#include "asterisk/file.h"
diff --git a/apps/app_dahdiscan.c b/apps/app_dahdiscan.c
index b76061395..d1d37fa51 100644
--- a/apps/app_dahdiscan.c
+++ b/apps/app_dahdiscan.c
@@ -38,7 +38,7 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include "asterisk/dahdi.h"
+#include <dahdi/user.h>
#include "asterisk/lock.h"
#include "asterisk/file.h"
diff --git a/apps/app_flash.c b/apps/app_flash.c
index dd13f414f..46f0e3b8a 100644
--- a/apps/app_flash.c
+++ b/apps/app_flash.c
@@ -33,7 +33,7 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include "asterisk/dahdi.h"
+#include <dahdi/user.h>
#include "asterisk/lock.h"
#include "asterisk/file.h"
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index fc0a08ae0..25cc0727e 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -37,7 +37,7 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include "asterisk/dahdi.h"
+#include <dahdi/user.h>
#include "asterisk/lock.h"
#include "asterisk/file.h"
@@ -292,7 +292,7 @@ static const char *descrip2 =
"will be returned in the variable. Upon app completion, MeetMeCount will hangup\n"
"the channel, unless priority n+1 exists, in which case priority progress will\n"
"continue.\n"
-"A ZAPTEL INTERFACE MUST BE INSTALLED FOR CONFERENCING FUNCTIONALITY.\n";
+"";
static const char *descrip3 =
" MeetMeAdmin(confno,command[,user]): Run admin command for conference\n"
diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index cdb7c399e..707c4e169 100644
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -334,12 +334,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <sys/io.h>
#include <sys/vfs.h>
#include <math.h>
-#ifdef OLD_ASTERISK
-#include <linux/zaptel.h>
-#include <tonezone.h>
-#else
-#include "asterisk/dahdi.h"
-#endif
+#include <dahdi/user.h>
+#include <dahdi/tonezone.h>
#include <netinet/in.h>
#include <arpa/inet.h>