diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2008-06-25 23:05:28 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-06-25 23:05:28 +0000 |
commit | fd4a60c4599189c2022f31bab18d03df39d3ea3e (patch) | |
tree | 4b50cc41540b7c5350a214a536d63dd9f03dd95e /res/res_musiconhold.c | |
parent | 14e78bbc6df085815869c8fc1555cfd33ad7540e (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 'res/res_musiconhold.c')
-rw-r--r-- | res/res_musiconhold.c | 2 |
1 files changed, 1 insertions, 1 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" |