From: James Golovich <james@gnuinter.net>
Date: Mon, 19 Jul 2004 05:00:05 +0000 (+0000)
Subject: Fix chan_zap compiling without libpri
X-Git-Tag: 1.0.0-rc2~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb8068322205a3e14ba86a0cd73d1ab0c11c8113;p=thirdparty%2Fasterisk.git

Fix chan_zap compiling without libpri


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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 024596e173..e997171bb6 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -1610,8 +1610,10 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout)
 			ast_mutex_unlock(&p->lock);
 			return -1;
 		}
+#ifdef ZAPATA_PRI
 		/* Start the trunk, if not GR-303 */
 		if (!p->pri) {
+#endif
 			x = ZT_START;
 			res = ioctl(p->subs[SUB_REAL].zfd, ZT_HOOK, &x);
 			if (res < 0) {
@@ -1621,7 +1623,9 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout)
 					return -1;
 				}
 			}
+#ifdef ZAPATA_PRI
 		}
+#endif
 		ast_log(LOG_DEBUG, "Dialing '%s'\n", c);
 		p->dop.op = ZT_DIAL_OP_REPLACE;
 		if (p->sig == SIG_FEATD) {
@@ -4748,7 +4752,7 @@ static void *ss_thread(void *data)
 				return NULL;
 			} else if (res)  {
 				exten[len++]=res;
-            	exten[len] = '\0';
+				exten[len] = '\0';
 			}
 			if (!ast_ignore_pattern(chan->context, exten))
 				tone_zone_play_tone(p->subs[index].zfd, -1);
@@ -4981,6 +4985,7 @@ static void *ss_thread(void *data)
 	case SIG_FXSLS:
 	case SIG_FXSGS:
 	case SIG_FXSKS:
+#ifdef ZAPATA_PRI
 		if (p->pri) {
 			/* This is a GR-303 trunk actually.  Wait for the first ring... */
 			struct ast_frame *f;
@@ -5010,6 +5015,7 @@ static void *ss_thread(void *data)
 				}
 			}
 		}
+#endif
 		if (p->use_callerid) {
 			cs = callerid_new();
 			if (cs) {