[svn-commits] kpfleming: branch 1.6.0 r125280 - in /branches/1.6.0: ./ res/res_musiconhold.c

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Thu Jun 26 07:11:19 2008
New Revision: 125280

URL: http://svn.digium.com/view/asterisk?view=rev&rev=125280
Log:
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!)

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/res/res_musiconhold.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/res/res_musiconhold.c?view=diff&rev=125280&r1=125279&r2=125280
==============================================================================
--- branches/1.6.0/res/res_musiconhold.c (original)
+++ branches/1.6.0/res/res_musiconhold.c Thu Jun 26 07:11:19 2008
@@ -46,7 +46,9 @@
 #include <thread.h>
 #endif
 
+#if defined(HAVE_DAHDI)
 #include <dahdi/user.h>
+#endif
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"