diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-25 23:05:28 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-25 23:05:28 +0000 |
| commit | ae1eb91abecf3d441295824fa3a2b7262ff8c941 (patch) | |
| tree | 4b50cc41540b7c5350a214a536d63dd9f03dd95e /main/asterisk.c | |
| parent | 90ab2bf707900b45b573d829b64f500531e0d12f (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: http://svn.digium.com/svn/asterisk/trunk@125138 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/asterisk.c')
| -rw-r--r-- | main/asterisk.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index fde3be6a3..9bbeebd25 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -86,8 +86,6 @@ int daemon(int, int); /* defined in libresolv of all places */ #include <sys/loadavg.h> #endif -#include "asterisk/dahdi.h" - #ifdef linux #include <sys/prctl.h> #ifdef HAVE_CAP |