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 /res | |
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 'res')
-rw-r--r-- | res/res_musiconhold.c | 2 | ||||
-rw-r--r-- | res/res_timing_dahdi.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 2b1605ec3..92303c3df 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -46,7 +46,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <thread.h> #endif -#include "asterisk/dahdi.h" +#include <dahdi/user.h> #include "asterisk/lock.h" #include "asterisk/file.h" diff --git a/res/res_timing_dahdi.c b/res/res_timing_dahdi.c index bc8076690..80b7b4977 100644 --- a/res/res_timing_dahdi.c +++ b/res/res_timing_dahdi.c @@ -36,9 +36,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$"); #include <fcntl.h> #include <math.h> +#include <dahdi/user.h> + #include "asterisk/module.h" #include "asterisk/timing.h" -#include "asterisk/dahdi.h" #include "asterisk/utils.h" static void *timing_funcs_handle; |