diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-26 12:11:19 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-26 12:11:19 +0000 |
commit | 843eceab6b9b6dbd83535f74c3b761408df3dc8d (patch) | |
tree | 73d5bc360389a9c9fbaeec6d6a082e3d6990b699 /res | |
parent | 0d6a1a00dafe2a05a1c86b4580a1452914d76689 (diff) |
Merged revisions 125279 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r125279 | kpfleming | 2008-06-26 07:09:24 -0500 (Thu, 26 Jun 2008) | 2 lines
fix compile failure found by buildbot (go, buildbot!)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125280 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r-- | res/res_musiconhold.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 7ab2c9109..ebb6050ec 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -46,7 +46,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <thread.h> #endif +#if defined(HAVE_DAHDI) #include <dahdi/user.h> +#endif #include "asterisk/lock.h" #include "asterisk/file.h" |