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 /apps/app_rpt.c | |
| 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 'apps/app_rpt.c')
| -rw-r--r-- | apps/app_rpt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_rpt.c b/apps/app_rpt.c index d45104ec1..40ce3492f 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -218,6 +218,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <sys/ioctl.h> #include <sys/io.h> #include <math.h> +#include <dahdi/user.h> +#include <dahdi/tonezone.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -236,8 +238,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/localtime.h" #include "asterisk/app.h" -#include "asterisk/dahdi.h" - static char *app = "Rpt"; static char *synopsis = "Radio Repeater/Remote Base Control System"; |