[svn-commits] jpeeler: branch 1.4 r122663 - in /branches/1.4: include/asterisk/ res/

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Fri Jun 13 13:57:24 2008
New Revision: 122663

URL: http://svn.digium.com/view/asterisk?view=rev&rev=122663
Log:
fixed dahdi compatability header from assuming either dahdi or zaptel is installed (may not have either)

Modified:
    branches/1.4/include/asterisk/dahdi_compat.h
    branches/1.4/res/res_musiconhold.c

Modified: branches/1.4/include/asterisk/dahdi_compat.h
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/dahdi_compat.h?view=diff&rev=122663&r1=122662&r2=122663
==============================================================================
--- branches/1.4/include/asterisk/dahdi_compat.h (original)
+++ branches/1.4/include/asterisk/dahdi_compat.h Fri Jun 13 13:57:24 2008
@@ -22,12 +22,12 @@
 #ifndef DAHDI_COMPAT_H
 #define DAHDI_COMPAT_H
 
-#ifndef HAVE_ZAPTEL
+#ifdef HAVE_DAHDI
 
 #include <dahdi/user.h>
 #include <dahdi/tonezone.h>
 
-#else
+#elif defined(HAVE_ZAPTEL)
 
 #include <zaptel/zaptel.h>
 #include <zaptel/tonezone.h>

Modified: branches/1.4/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/res/res_musiconhold.c?view=diff&rev=122663&r1=122662&r2=122663
==============================================================================
--- branches/1.4/res/res_musiconhold.c (original)
+++ branches/1.4/res/res_musiconhold.c Fri Jun 13 13:57:24 2008
@@ -27,7 +27,7 @@
 
 /*** MODULEINFO
 	<conflict>win32</conflict>
-	<use>zaptel</use>
+	<use>dahdi</use>
  ***/
 
 #include "asterisk.h"