diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-25 23:20:35 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-25 23:20:35 +0000 |
| commit | a9d05ec703ba688539f4978bc47dea878220defe (patch) | |
| tree | 32eaaa9ed24c66cfb82e690bc0af19d72068f2b4 /channels | |
| parent | e9d29f7eafbbbd5cbc4ab207be70ff3f96bfaf36 (diff) | |
Merged revisions 125138 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r125138 | kpfleming | 2008-06-25 18:05:28 -0500 (Wed, 25 Jun 2008) | 18 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@125146 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 14 | ||||
| -rw-r--r-- | channels/chan_iax2.c | 3 |
2 files changed, 5 insertions, 12 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 86f13b527..5165fb522 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -58,7 +58,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <sys/ioctl.h> #include <math.h> #include <ctype.h> -#include "asterisk/dahdi.h" + +#include <dahdi/user.h> +#include <dahdi/tonezone.h> #ifdef HAVE_PRI #include <libpri.h> @@ -124,16 +126,6 @@ static struct ast_jb_conf default_jbconf = }; static struct ast_jb_conf global_jbconf; -#if !defined(DAHDI_SIG_EM_E1) || (defined(HAVE_PRI) && !defined(DAHDI_SIG_HARDHDLC)) -#error "Your DAHDI is too old. Please update" -#endif - -#ifndef DAHDI_TONEDETECT -/* Work around older code with no tone detect */ -#define DAHDI_EVENT_DTMFDOWN 0 -#define DAHDI_EVENT_DTMFUP 0 -#endif - /* define this to send PRI user-user information elements */ #undef SUPPORT_USERUSER diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 90a1961b5..92d14d188 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -52,8 +52,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <fcntl.h> #include <sys/stat.h> #include <regex.h> +#include <sys/ioctl.h> +#include <dahdi/user.h> -#include "asterisk/dahdi.h" #include "asterisk/paths.h" /* need ast_config_AST_DATA_DIR for firmware */ #include "asterisk/lock.h" |