[Asterisk-cvs] asterisk/channels chan_zap.c,1.301,1.302

[citats at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory localhost.localdomain:/home/citats/cvs/asterisk/channels

Modified Files:
	chan_zap.c 
Log Message:
Fix chan_zap compiling without libpri

Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -d -r1.301 -r1.302
--- chan_zap.c	19 Jul 2004 02:18:11 -0000	1.301
+++ chan_zap.c	19 Jul 2004 05:00:05 -0000	1.302
@@ -1610,8 +1610,10 @@
 			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 @@
 					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 @@
 				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 @@
 	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 @@
 				}
 			}
 		}
+#endif
 		if (p->use_callerid) {
 			cs = callerid_new();
 			if (cs) {