[Asterisk-cvs] asterisk/channels chan_zap.c,1.156,1.157

[martinp at lists.digium.com]

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

Modified Files:
	chan_zap.c 
Log Message:
Move zaptrcallerid out of #define ZAPATA_PRI


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- chan_zap.c	18 Dec 2003 16:01:08 -0000	1.156
+++ chan_zap.c	18 Dec 2003 16:02:33 -0000	1.157
@@ -449,6 +449,7 @@
 	int pulsedial;		/* whether a pulse dial phone is detected */
 	int dtmfrelax;		/* whether to run in relaxed DTMF mode */
 	int fake_event;
+	int zaptrcallerid;	/* should we use the callerid from incoming call on zap transfer or not */
 #ifdef ZAPATA_PRI
 	struct zt_pri *pri;
 	q931_call *call;
@@ -456,7 +457,6 @@
 	int resetting;
 	int prioffset;
 	int alreadyhungup;
-	int zaptrcallerid;	/* should we use the callerid from incoming call on zap transfer or not */
 #ifdef PRI_EVENT_PROCEEDING
 	int proceeding;
 #endif