Prepended QM_ to QWK function mode bit definitions.

src/sbbs3/pack_qwk.cpp

@@ -92,11 +92,11 @@ bool sbbs_t::pack_qwk(char *packet, ulong *msgcnt, bool prepack)
 		mode=A_LEAVE;
 	else mode=0;
 	if(useron.qwk&QWK_TZ)
-		mode|=TZ;
+		mode|=QM_TZ;
 	if(useron.qwk&QWK_VIA)
-		mode|=VIA;
+		mode|=QM_VIA;
 	if(useron.qwk&QWK_MSGID)
-		mode|=MSGID;
+		mode|=QM_MSGID;
 
 	(*msgcnt)=0L;
 	if(/* !prepack && */ !(useron.qwk&QWK_NOCTRL)) {
@@ -266,9 +266,9 @@ bool sbbs_t::pack_qwk(char *packet, ulong *msgcnt, bool prepack)
 				ndx=NULL;
 
 			if(useron.rest&FLAG('Q'))
-				mode|=TO_QNET;
+				mode|=QM_TO_QNET;
 			else
-				mode&=~TO_QNET;
+				mode&=~QM_TO_QNET;
 
 			for(l=0;(ulong)l<mailmsgs;l++) {
 				bprintf("\b\b\b\b\b\b\b\b\b\b\b\b%4lu of %-4lu"
@@ -394,16 +394,16 @@ bool sbbs_t::pack_qwk(char *packet, ulong *msgcnt, bool prepack)
 							smb_freemsgmem(&msg);			 /* net, don't gate */
 							smb_unlockmsghdr(&smb,&msg);
 							continue; }
-						mode|=(TO_QNET|TAGLINE);
+						mode|=(QM_TO_QNET|QM_TAGLINE);
 						if(msg.from_net.type==NET_QWK) {
-							mode&=~TAGLINE;
+							mode&=~QM_TAGLINE;
 							if(route_circ((char *)msg.from_net.addr,useron.alias)
 								|| !strnicmp(msg.subj,"NE:",3)) {
 								smb_freemsgmem(&msg);
 								smb_unlockmsghdr(&smb,&msg);
 								continue; } } }
 					else
-						mode&=~(TAGLINE|TO_QNET);
+						mode&=~(QM_TAGLINE|QM_TO_QNET);
 
 					size=msgtoqwk(&msg,qwk,mode,usrsub[i][j],conf);
 					smb_unlockmsghdr(&smb,&msg);

src/sbbs3/pack_rep.cpp

@@ -116,7 +116,7 @@ bool sbbs_t::pack_rep(uint hubnum)
 				smb_freemsgmem(&msg);
 				continue; }
 
-			msgtoqwk(&msg,rep,TO_QNET|REP|A_LEAVE,INVALID_SUB,0);
+			msgtoqwk(&msg,rep,QM_TO_QNET|QM_REP|A_LEAVE,INVALID_SUB,0);
 			packedmail++;
 			smb_unlockmsghdr(&smb,&msg);
 			smb_freemsgmem(&msg); 
@@ -180,10 +180,10 @@ bool sbbs_t::pack_rep(uint hubnum)
 				smb_unlockmsghdr(&smb,&msg);
 				continue; }
 
-			mode=cfg.qhub[hubnum]->mode[i]|TO_QNET|REP;
-			if(mode&A_LEAVE) mode|=(VIA|TZ|MSGID);
+			mode=cfg.qhub[hubnum]->mode[i]|QM_TO_QNET|QM_REP;
+			if(mode&A_LEAVE) mode|=(QM_VIA|QM_TZ|QM_MSGID);
 			if(msg.from_net.type!=NET_QWK)
-				mode|=TAGLINE;
+				mode|=QM_TAGLINE;
 
 			msgtoqwk(&msg,rep,mode,j,cfg.qhub[hubnum]->conf[i]);
 

src/sbbs3/qwk.h

@@ -39,12 +39,13 @@
 #define QWK_BLOCK_LEN	128
 
 /* QWK mode bits */
-#define TAGLINE 	(1<<5)	/* Place tagline at end of qwk message */
-#define TO_QNET 	(1<<6)	/* Sending to hub */
-#define REP 		(1<<7)	/* It's a REP packet */
-#define VIA 		(1<<8)	/* Include VIA */
-#define TZ			(1<<9)	/* Include TZ */
-#define MSGID		(1<<10)	/* Include MSGID and REPLY */
+#define QM_TAGLINE 	(1<<5)	/* Place tagline at end of qwk message */
+#define QM_TO_QNET 	(1<<6)	/* Sending to hub */
+#define QM_REP 		(1<<7)	/* It's a REP packet */
+#define QM_VIA 		(1<<8)	/* Include VIA */
+#define QM_TZ		(1<<9)	/* Include TZ */
+#define QM_MSGID	(1<<10)	/* Include MSGID and REPLY */
+#define QM_REPLYTO	(1<<11)	/* Include REPLYTO */
 
 float	ltomsbin(long val);
 bool	route_circ(char *via, char *id);