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

[SVN commits to the Digium repositories]

Author: bweschke
Date: Sun Oct 19 14:51:16 2008
New Revision: 151167

URL: http://svn.digium.com/view/asterisk?view=rev&rev=151167
Log:
 As per kpfleming's comments to the prior commit, I'm reverting some of the changes here. 

 A comment was made in bug #13726 
 "3. The same mistake as in (2) is done in a few other places in the code that check for: #if defined(HAVE_ZAPTEL) || defined(HAVE_DAHDI)
Harmless, but still incorrect."

 In the case of main/asterisk.c, this is not incorrect because without HAVE_ZAPTEL defined, we're missing
 the include for ioctl and the namespace that defines DAHDI_TIMERCONFIG which is still required when
 using Zaptel with the 1.4 branch.


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=151167&r1=151166&r2=151167
==============================================================================
--- branches/1.4/main/asterisk.c (original)
+++ branches/1.4/main/asterisk.c Sun Oct 19 14:51:16 2008
@@ -76,14 +76,7 @@
 
 #if defined(HAVE_ZAPTEL) || defined (HAVE_DAHDI)
 #include <sys/ioctl.h>
-#endif
-
-#if defined(HAVE_DAHDI)
 #include "asterisk/dahdi_compat.h"
-#endif
-
-#if defined(HAVE_ZAPTEL)
-#include <zaptel/zaptel.h>
 #endif
 
 #ifdef linux
@@ -2998,7 +2991,7 @@
 		int x = 160;
 		fd = open("/dev/zap/timer", O_RDWR);
 		if (fd >= 0) {
-			if (ioctl(fd, ZT_TIMERCONFIG, &x)) {
+			if (ioctl(fd, DAHDI_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);
 			}