From 29f496ef12247a2401d02428fa533020b588f5b6 Mon Sep 17 00:00:00 2001
From: kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Mon, 24 Apr 2006 17:11:45 +0000
Subject: Thanks to the fine work of Russell Bryant and Dancho Lazarov, we now
 have autoconf and menuselect tools for Asterisk!

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@22267 f38db490-d61c-443f-a65b-d21fe96a405b
---
 channel.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'channel.c')

diff --git a/channel.c b/channel.c
index a1ba62df4..9b57ccec2 100644
--- a/channel.c
+++ b/channel.c
@@ -32,7 +32,9 @@
 #include <unistd.h>
 #include <math.h>			/* For PI */
 
-#ifdef ZAPTEL_OPTIMIZATIONS
+#include "asterisk.h"
+
+#ifdef HAVE_ZAPTEL
 #include <sys/ioctl.h>
 #ifdef __linux__
 #include <linux/zaptel.h>
@@ -44,8 +46,6 @@
 #endif
 #endif
 
-#include "asterisk.h"
-
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/pbx.h"
@@ -605,7 +605,7 @@ struct ast_channel *ast_channel_alloc(int needqueue)
 	for (x=0; x<AST_MAX_FDS - 2; x++)
 		tmp->fds[x] = -1;
 
-#ifdef ZAPTEL_OPTIMIZATIONS
+#ifdef HAVE_ZAPTEL
 	tmp->timingfd = open("/dev/zap/timer", O_RDWR);
 	if (tmp->timingfd > -1) {
 		/* Check if timing interface supports new
@@ -714,7 +714,7 @@ int ast_queue_frame(struct ast_channel *chan, struct ast_frame *fin)
 		if (write(chan->alertpipe[1], &blah, sizeof(blah)) != sizeof(blah))
 			ast_log(LOG_WARNING, "Unable to write to alert pipe on %s, frametype/subclass %d/%d (qlen = %d): %s!\n",
 				chan->name, f->frametype, f->subclass, qlen, strerror(errno));
-#ifdef ZAPTEL_OPTIMIZATIONS
+#ifdef HAVE_ZAPTEL
 	} else if (chan->timingfd > -1) {
 		ioctl(chan->timingfd, ZT_TIMERPING, &blah);
 #endif				
@@ -1739,7 +1739,7 @@ int ast_waitfordigit(struct ast_channel *c, int ms)
 int ast_settimeout(struct ast_channel *c, int samples, int (*func)(void *data), void *data)
 {
 	int res = -1;
-#ifdef ZAPTEL_OPTIMIZATIONS
+#ifdef HAVE_ZAPTEL
 	if (c->timingfd > -1) {
 		if (!func) {
 			samples = 0;
@@ -1852,7 +1852,7 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
 	if (chan->alertpipe[0] > -1)
 		read(chan->alertpipe[0], &blah, sizeof(blah));
 
-#ifdef ZAPTEL_OPTIMIZATIONS
+#ifdef HAVE_ZAPTEL
 	if (chan->timingfd > -1 && chan->fdno == AST_TIMING_FD && ast_test_flag(chan, AST_FLAG_EXCEPTION)) {
 		int res;
 
-- 
cgit v1.2.3