[Shadowirc-commits] CVS: shadowirc/src DCC.c,1.50,1.51 DCC.h,1.7,1.8

[John B. <ds...@us...>]

Update of /cvsroot/shadowirc/shadowirc/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8725/src

Modified Files:
	DCC.c DCC.h 
Log Message:
Tiger compile fix - fix enum dccFlags items to not conflict with unix 'open' symbol. [mhaque]

Index: DCC.c
===================================================================
RCS file: /cvsroot/shadowirc/shadowirc/src/DCC.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- DCC.c	25 Jan 2005 13:07:05 -0000	1.50
+++ DCC.c	1 May 2005 04:43:07 -0000	1.51
@@ -561,7 +561,7 @@
 
 static void StartDCCGet(connectionPtr x)
 {
-	if(x->dcc->dccFlags == opening || x->dcc->dccFlags == open) //already open!!
+	if(x->dcc->dccFlags == dccOpening || x->dcc->dccFlags == dccOpen) //already open!!
 		return;
 	
 	if(mainPrefs->autoSaveDCC) //go ahead
@@ -596,7 +596,7 @@
 		dd = (dccSENDDataPtr)d->dccData;
 		if(sendRev)
 		{
-			d->dccFlags = waitingRev;
+			d->dccFlags = dccWaitingRev;
 			d->reverse = true;
 		}
 		
@@ -746,7 +746,7 @@
 						if(DCCCreate(link, dccCHAT, name, &x)) //if true, then created...
 						{
 						}
-						if(x->dcc->dccFlags == closed || x->dcc->dccFlags == waiting || x->dcc->dccFlags == offered)
+						if(x->dcc->dccFlags == dccClosed || x->dcc->dccFlags == dccWaiting || x->dcc->dccFlags == dccOffered)
 							DCCOpen(&x);
 					}
 					else
@@ -806,9 +806,9 @@
 	pDCCOpenedData p;
 	ConstStringPtr sp;
 	
-	if(d->dccFlags==waitingRev)
+	if(d->dccFlags == dccWaitingRev)
 	{
-		d->dccFlags=offered;
+		d->dccFlags = dccOffered;
 		//Make a fake
 		d->refcon = (void*)++dccSENDRevCount;
 		
@@ -839,9 +839,9 @@
 		SendCommand(cc->link, &ls);
 		LSParamString(&ls, GetIntStringPtr(spDCC, sRequestingRevDCC), sp, d->dccUserName, 0, 0);
 		SMPrefixLinkColor(cc->link, &ls, dsFrontWin, sicCTCP);
-		d->dccFlags=waiting;
+		d->dccFlags = dccWaiting;
 	}
-	else if(d->dccFlags == closed)
+	else if(d->dccFlags == dccClosed)
 	{
 		if(ConnNewListen(cc, AF_UNSPEC, 10))
 		{
@@ -908,13 +908,13 @@
 			SendCommand(cc->link, &ls);
 			LSParamString(&ls, GetIntStringPtr(spDCC, sRequestingDCC), sp, d->dccUserName, 0, 0);
 			SMPrefixLinkColor(cc->link, &ls, dsFrontWin, sicCTCP);
-			d->dccFlags=waiting;
+			d->dccFlags = dccWaiting;
 			opened=1;
 		}
 		else
 			DCCFailed(x, GetIntStringPtr(spDCC, sFailedToCreate));
 	}
-	else if(d->dccFlags==offered)
+	else if(d->dccFlags == dccOffered)
 	{
 		char hbuf[NI_MAXHOST];
 		
@@ -929,7 +929,7 @@
 		
 		if(1)
 		{
-			d->dccFlags=opening;
+			d->dccFlags = dccOpening;
 			LSParamString(&ls, GetIntStringPtr(spDCC, sOpeningDCC), d->dccUserName, des, args, 0);
 			SMPrefixLinkColor(cc->link, &ls, dsFrontWin, sicCTCP);
 			opened=1;
@@ -1244,7 +1244,7 @@
 	
 	conn = *cn;
 	d=conn->dcc;
-	d->dccFlags=open;
+	d->dccFlags = dccOpen;
 	switch(d->dccType)
 	{
 		case dccCHAT:
@@ -1736,7 +1736,7 @@
 //		SMPrefixLinkColor(link, &ls, dsFrontWin, sicCTCP);
 
 		//but only if the chat's not going already...
-		if(x->dcc->dccFlags == open)
+		if(x->dcc->dccFlags == dccOpen)
 			return;
 		
 		DCCClose(&x, true);
@@ -1759,7 +1759,7 @@
 		BlockZero(x->sas, sizeof(struct sockaddr_storage));
 		x->port = 0;
 		d->refcon = (void*)revNum;
-		d->dccFlags = closed;
+		d->dccFlags = dccClosed;
 		d->reverse = true;
 	}
 	else
@@ -1786,7 +1786,7 @@
 		NextArg(s, c); //port
 		StringToNum(c, &l);
 		x->port=l;
-		d->dccFlags=offered;
+		d->dccFlags = dccOffered;
 	}
 
 
@@ -1851,7 +1851,7 @@
 		BlockZero(x->sas, sizeof(struct sockaddr_storage));
 		x->port = 0;
 		d->refcon = (void*)revNum;
-		d->dccFlags = closed;
+		d->dccFlags = dccClosed;
 		d->reverse = true;
 	}
 	else
@@ -1878,7 +1878,7 @@
 		NextArg(s, c); //port
 		StringToNum(c, &l);
 		x->port=l;
-		d->dccFlags=offered;
+		d->dccFlags = dccOffered;
 	}
 	
 	dd = (dccGETDataPtr)d->dccData;
@@ -2043,7 +2043,7 @@
 						StringToNum(c, &l);
 						x->port=l;
 						
-						x->dcc->dccFlags = offered;
+						x->dcc->dccFlags = dccOffered;
 						DCCOpen(&x);
 					}
 					else
@@ -2185,15 +2185,15 @@
 {
 	switch(d)
 	{
-		case closed:
+		case dccClosed:
 			return "\pCLOSED";
-		case waiting:
+		case dccWaiting:
 			return "\pWAITING";
-		case offered:
+		case dccOffered:
 			return "\pOFFERED";
-		case opening:
+		case dccOpening:
 			return "\pOPENING";
-		case open:
+		case dccOpen:
 			return "\pOPEN";
 		default:
 			return "\pUNKNOWN";

Index: DCC.h
===================================================================
RCS file: /cvsroot/shadowirc/shadowirc/src/DCC.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- DCC.h	24 Apr 2003 16:22:15 -0000	1.7
+++ DCC.h	1 May 2005 04:43:07 -0000	1.8
@@ -64,7 +64,7 @@
 };
 
 enum dccTypes {dccNIL, dccCHAT, dccGET, dccSEND, dccRESUME, dccREVERSE, dccNIL2, dcccLIST, dcccCLOSE, dcccMAXIMUM};
-enum dccFlags {closed, waiting, offered, opening, open, waitingRev};
+enum dccFlags {dccClosed, dccWaiting, dccOffered, dccOpening, dccOpen, dccWaitingRev};
 enum dccSendStage {sendNIL, sendHeader, sendDF, sendRF, sendDone};
 
 typedef struct dccTypeRec {