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.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@151167 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/asterisk.c

@@ -76,16 +76,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #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
 #include <sys/prctl.h>
 #ifdef HAVE_CAP
@@ -2998,7 +2991,7 @@ int main(int argc, char *argv[])
 		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);
 			}