[Asterisk-cvs] asterisk/channels chan_zap.c,1.537,1.538

[markster]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv19802/channels

Modified Files:
	chan_zap.c 
Log Message:
Fix chan_zap build on non-PRI (bug #5620)


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.537
retrieving revision 1.538
diff -u -d -r1.537 -r1.538
--- chan_zap.c	5 Nov 2005 22:30:31 -0000	1.537
+++ chan_zap.c	6 Nov 2005 04:38:39 -0000	1.538
@@ -666,13 +666,13 @@
 	q931_call *call;
 	int prioffset;
 	int logicalspan;
-	int dsp_features;
 #endif	
 #ifdef ZAPATA_R2
 	int r2prot;
 	mfcr2_t *r2;
 #endif	
 	int polarity;
+	int dsp_features;
 
 } *iflist = NULL, *ifend = NULL;
 
@@ -5023,12 +5023,12 @@
 			} else {
 				i->dsp = ast_dsp_new();
 				if (i->dsp) {
+					i->dsp_features = features & ~DSP_PROGRESS_TALK;
 #ifdef ZAPATA_PRI
 					/* We cannot do progress detection until receives PROGRESS message */
 					if (i->outgoing && (i->sig == SIG_PRI)) {
 						/* Remember requested DSP features, don't treat
 						   talking as ANSWER */
-						i->dsp_features = features & ~DSP_PROGRESS_TALK;
 						features = 0;
 					}
 #endif