[svn-commits] bweschke: branch 1.4 r151100 - /branches/1.4/main/asterisk.c

[SVN commits to the Digium repositories]

Author: bweschke
Date: Sun Oct 19 14:07:05 2008
New Revision: 151100

URL: http://svn.digium.com/view/asterisk?view=rev&rev=151100
Log:
 Fix the 1.4 branch compile again broken with r150557 when using with Zaptel and not DAHDI

 (closes issue #13740)
 reported by: jmls
 patch by: bweschke


Modified:
    branches/1.4/main/asterisk.c

Modified: branches/1.4/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/asterisk.c?view=diff&rev=151100&r1=151099&r2=151100
==============================================================================
--- branches/1.4/main/asterisk.c (original)
+++ branches/1.4/main/asterisk.c Sun Oct 19 14:07:05 2008
@@ -74,9 +74,16 @@
 #include <pwd.h>
 #include <sys/stat.h>
 
+#if defined(HAVE_ZAPTEL) || defined (HAVE_DAHDI)
+#include <sys/ioctl.h>
+#endif
+
 #if defined(HAVE_DAHDI)
-#include <sys/ioctl.h>
 #include "asterisk/dahdi_compat.h"
+#endif
+
+#if defined(HAVE_ZAPTEL)
+#include <zaptel/zaptel.h>
 #endif
 
 #ifdef linux
@@ -2991,7 +2998,7 @@
 		int x = 160;
 		fd = open("/dev/zap/timer", O_RDWR);
 		if (fd >= 0) {
-			if (ioctl(fd, DAHDI_TIMERCONFIG, &x)) {
+			if (ioctl(fd, ZT_TIMERCONFIG, &x)) {
 				ast_log(LOG_ERROR, "You have Zaptel built and drivers loaded, but the Zaptel timer test failed to set ZT_TIMERCONFIG to %d.\n", x);
 				exit(1);
 			}