[svn-commits] tilghman: branch 1.4 r125893 - /branches/1.4/include/asterisk/tonezone_compat.h

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Jun 27 11:46:05 2008
New Revision: 125893

URL: http://svn.digium.com/view/asterisk?view=rev&rev=125893
Log:
Since HAVE_DAHDI is defined to HAVE_ZAPTEL in dahdi_compat.h, we must first
check for HAVE_ZAPTEL.
(closes issue #12938)
 Reported by: opticron
 Patches: 
       tonezone_compat.diff uploaded by opticron (license 267)

Modified:
    branches/1.4/include/asterisk/tonezone_compat.h

Modified: branches/1.4/include/asterisk/tonezone_compat.h
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/tonezone_compat.h?view=diff&rev=125893&r1=125892&r2=125893
==============================================================================
--- branches/1.4/include/asterisk/tonezone_compat.h (original)
+++ branches/1.4/include/asterisk/tonezone_compat.h Fri Jun 27 11:46:05 2008
@@ -22,13 +22,13 @@
 #ifndef TONEZONE_COMPAT_H
 #define TONEZONE_COMPAT_H
 
-#if defined(HAVE_DAHDI)
+#if defined(HAVE_ZAPTEL)
+
+#include <zaptel/tonezone.h>
+
+#elif defined(HAVE_DAHDI)
 
 #include <dahdi/tonezone.h>
-
-#elif defined(HAVE_ZAPTEL)
-
-#include <zaptel/tonezone.h>
 
 #endif