fixed:linux build error

xengine-qyt · xengine-qyt · commit 0b4ea6306860 · 2022-03-14T10:48:37.000+08:00
diff --git a/XEngine_Source/StorageModule_APIHelp/APIHelp_Distributed/APIHelp_Distributed.cpp b/XEngine_Source/StorageModule_APIHelp/APIHelp_Distributed/APIHelp_Distributed.cpp
@@ -85,7 +85,7 @@ BOOL CAPIHelp_Distributed::APIHelp_Distributed_RandomAddr(list<string>* pStl_Lis
 		{
 			nRandomFront = 0;
 		}
-		int i = 0;
+		unsigned int i = 0;
 		for (auto stl_ListIterator = pStl_ListAddr->begin(); stl_ListIterator != pStl_ListAddr->end(); stl_ListIterator++, i++)
 		{
 			if (nRandomFront == i)
@@ -102,7 +102,7 @@ BOOL CAPIHelp_Distributed::APIHelp_Distributed_RandomAddr(list<string>* pStl_Lis
 		{
 			nRandomBack = 0;
 		}
-		int i = 0;
+		unsigned int i = 0;
 		for (auto stl_ListIterator = pStl_ListAddr->rbegin(); stl_ListIterator != pStl_ListAddr->rend(); stl_ListIterator++, i++)
 		{
 			if (nRandomBack == i)
@@ -290,8 +290,8 @@ BOOL CAPIHelp_Distributed::APIHelp_Distributed_UPStorage(LPCTSTR lpszMsgBuffer,
 		SystemApi_File_EnumFile(pSt_StorageBucket->tszFilePath, &ppListFile, &nListCount, NULL, NULL, TRUE, 1);
 		for (int j = 0; j < nListCount; j++)
 		{
-			struct __stat64 st_FStat;
-			_stat64(ppListFile[j], &st_FStat);
+			struct _tstat64 st_FStat;
+			_tstat64(ppListFile[j], &st_FStat);
 			nDirCount += st_FStat.st_size;
 		}
 		BaseLib_OperatorMemory_Free((XPPPMEM)&ppListFile, nListCount);
@@ -334,8 +334,8 @@ BOOL CAPIHelp_Distributed::APIHelp_Distributed_UPStorage(LPCTSTR lpszMsgBuffer,
 					SystemApi_File_EnumFile(stl_ListIterator->tszFilePath, &ppListFile, &nListCount, NULL, NULL, TRUE, 1);
 					for (int j = 0; j < nListCount; j++)
 					{
-						struct __stat64 st_FStat;
-						_stat64(ppListFile[j], &st_FStat);
+						struct _tstat64 st_FStat;
+						_tstat64(ppListFile[j], &st_FStat);
 						nDirCount += st_FStat.st_size;
 					}
 					BaseLib_OperatorMemory_Free((XPPPMEM)&ppListFile, nListCount);
@@ -382,7 +382,7 @@ BOOL CAPIHelp_Distributed::APIHelp_Distributed_UPStorage(LPCTSTR lpszMsgBuffer,
 			{
 				nUPFront = 0;
 			}
-			int i = 0;
+			unsigned int i = 0;
 			for (auto stl_ListIterator = stl_BuckSelect.begin(); stl_ListIterator != stl_BuckSelect.end(); stl_ListIterator++, i++)
 			{
 				if (nUPFront == i)
@@ -399,7 +399,7 @@ BOOL CAPIHelp_Distributed::APIHelp_Distributed_UPStorage(LPCTSTR lpszMsgBuffer,
 			{
 				nUPBack = 0;
 			}
-			int i = 0;
+			unsigned int i = 0;
 			for (auto stl_ListIterator = stl_BuckSelect.rbegin(); stl_ListIterator != stl_BuckSelect.rend(); stl_ListIterator++, i++)
 			{
 				if (nUPBack == i)
diff --git a/XEngine_Source/StorageModule_Session/Session_Stroage/Session_DLStroage.cpp b/XEngine_Source/StorageModule_Session/Session_Stroage/Session_DLStroage.cpp
@@ -129,10 +129,10 @@ BOOL CSession_DLStroage::Session_DLStroage_Insert(LPCTSTR lpszClientAddr, LPCTST
 	st_Locker.unlock_shared();
 
 	SESSION_STORAGEINFO st_Client;
-	struct __stat64 st_FStat;
+	struct _tstat64 st_FStat;
 
 	memset(&st_Client, '\0', sizeof(SESSION_STORAGEINFO));
-	int nRet = _stat64(lpszFileDir, &st_FStat);
+	int nRet = _tstat64(lpszFileDir, &st_FStat);
 	if (-1 == nRet)
 	{
 		Session_IsErrorOccur = TRUE;
diff --git a/XEngine_Source/StorageModule_Session/Session_Stroage/Session_UPStroage.cpp b/XEngine_Source/StorageModule_Session/Session_Stroage/Session_UPStroage.cpp
@@ -372,9 +372,9 @@ BOOL CSession_UPStroage::Session_UPStroage_Delete(LPCTSTR lpszClientAddr)
 		}
 		if (0 == stl_MapIterator->second.st_StorageInfo.ullFSize)
 		{
-			struct __stat64 st_FStat;
-			memset(&st_FStat, '\0', sizeof(struct __stat64));
-			_stat64(stl_MapIterator->second.st_StorageInfo.tszFileDir, &st_FStat);
+			struct _tstat64 st_FStat;
+			memset(&st_FStat, '\0', sizeof(struct _tstat64));
+			_tstat64(stl_MapIterator->second.st_StorageInfo.tszFileDir, &st_FStat);
 			stl_MapIterator->second.st_StorageInfo.ullFSize = st_FStat.st_size;
 		}
 		//大小是否足够
@@ -412,9 +412,9 @@ BOOL CSession_UPStroage::Session_UPStroage_Close(LPCTSTR lpszClientAddr)
 		{
 			fclose(stl_MapIterator->second.st_StorageInfo.pSt_File);
 		}
-		struct __stat64 st_FStat;
-		memset(&st_FStat, '\0', sizeof(struct __stat64));
-		_stat64(stl_MapIterator->second.st_StorageInfo.tszFileDir, &st_FStat);
+		struct _tstat64 st_FStat;
+		memset(&st_FStat, '\0', sizeof(struct _tstat64));
+		_tstat64(stl_MapIterator->second.st_StorageInfo.tszFileDir, &st_FStat);
 		stl_MapIterator->second.st_StorageInfo.ullFSize = st_FStat.st_size;
 	}
 	st_Locker.unlock();

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ BOOL CAPIHelp_Distributed::APIHelp_Distributed_RandomAddr(list<string>* pStl_Lis`
`85`	`85`	`{`
`86`	`86`	`nRandomFront = 0;`
`87`	`87`	`}`
`88`		`- int i = 0;`
	`88`	`+ unsigned int i = 0;`
`89`	`89`	`for (auto stl_ListIterator = pStl_ListAddr->begin(); stl_ListIterator != pStl_ListAddr->end(); stl_ListIterator++, i++)`
`90`	`90`	`{`
`91`	`91`	`if (nRandomFront == i)`
`@@ -102,7 +102,7 @@ BOOL CAPIHelp_Distributed::APIHelp_Distributed_RandomAddr(list<string>* pStl_Lis`
`102`	`102`	`{`
`103`	`103`	`nRandomBack = 0;`
`104`	`104`	`}`
`105`		`- int i = 0;`
	`105`	`+ unsigned int i = 0;`
`106`	`106`	`for (auto stl_ListIterator = pStl_ListAddr->rbegin(); stl_ListIterator != pStl_ListAddr->rend(); stl_ListIterator++, i++)`
`107`	`107`	`{`
`108`	`108`	`if (nRandomBack == i)`
`@@ -290,8 +290,8 @@ BOOL CAPIHelp_Distributed::APIHelp_Distributed_UPStorage(LPCTSTR lpszMsgBuffer,`
`290`	`290`	`SystemApi_File_EnumFile(pSt_StorageBucket->tszFilePath, &ppListFile, &nListCount, NULL, NULL, TRUE, 1);`
`291`	`291`	`for (int j = 0; j < nListCount; j++)`
`292`	`292`	`{`
`293`		`- struct __stat64 st_FStat;`
`294`		`- _stat64(ppListFile[j], &st_FStat);`
	`293`	`+ struct _tstat64 st_FStat;`
	`294`	`+ _tstat64(ppListFile[j], &st_FStat);`
`295`	`295`	`nDirCount += st_FStat.st_size;`
`296`	`296`	`}`
`297`	`297`	`BaseLib_OperatorMemory_Free((XPPPMEM)&ppListFile, nListCount);`
`@@ -334,8 +334,8 @@ BOOL CAPIHelp_Distributed::APIHelp_Distributed_UPStorage(LPCTSTR lpszMsgBuffer,`
`334`	`334`	`SystemApi_File_EnumFile(stl_ListIterator->tszFilePath, &ppListFile, &nListCount, NULL, NULL, TRUE, 1);`
`335`	`335`	`for (int j = 0; j < nListCount; j++)`
`336`	`336`	`{`
`337`		`- struct __stat64 st_FStat;`
`338`		`- _stat64(ppListFile[j], &st_FStat);`
	`337`	`+ struct _tstat64 st_FStat;`
	`338`	`+ _tstat64(ppListFile[j], &st_FStat);`
`339`	`339`	`nDirCount += st_FStat.st_size;`
`340`	`340`	`}`
`341`	`341`	`BaseLib_OperatorMemory_Free((XPPPMEM)&ppListFile, nListCount);`
`@@ -382,7 +382,7 @@ BOOL CAPIHelp_Distributed::APIHelp_Distributed_UPStorage(LPCTSTR lpszMsgBuffer,`
`382`	`382`	`{`
`383`	`383`	`nUPFront = 0;`
`384`	`384`	`}`
`385`		`- int i = 0;`
	`385`	`+ unsigned int i = 0;`
`386`	`386`	`for (auto stl_ListIterator = stl_BuckSelect.begin(); stl_ListIterator != stl_BuckSelect.end(); stl_ListIterator++, i++)`
`387`	`387`	`{`
`388`	`388`	`if (nUPFront == i)`
`@@ -399,7 +399,7 @@ BOOL CAPIHelp_Distributed::APIHelp_Distributed_UPStorage(LPCTSTR lpszMsgBuffer,`
`399`	`399`	`{`
`400`	`400`	`nUPBack = 0;`
`401`	`401`	`}`
`402`		`- int i = 0;`
	`402`	`+ unsigned int i = 0;`
`403`	`403`	`for (auto stl_ListIterator = stl_BuckSelect.rbegin(); stl_ListIterator != stl_BuckSelect.rend(); stl_ListIterator++, i++)`
`404`	`404`	`{`
`405`	`405`	`if (nUPBack == i)`
Original file line number	Diff line number	Diff line change
`@@ -372,9 +372,9 @@ BOOL CSession_UPStroage::Session_UPStroage_Delete(LPCTSTR lpszClientAddr)`
`372`	`372`	`}`
`373`	`373`	`if (0 == stl_MapIterator->second.st_StorageInfo.ullFSize)`
`374`	`374`	`{`
`375`		`- struct __stat64 st_FStat;`
`376`		`- memset(&st_FStat, '\0', sizeof(struct __stat64));`
`377`		`- _stat64(stl_MapIterator->second.st_StorageInfo.tszFileDir, &st_FStat);`
	`375`	`+ struct _tstat64 st_FStat;`
	`376`	`+ memset(&st_FStat, '\0', sizeof(struct _tstat64));`
	`377`	`+ _tstat64(stl_MapIterator->second.st_StorageInfo.tszFileDir, &st_FStat);`
`378`	`378`	`stl_MapIterator->second.st_StorageInfo.ullFSize = st_FStat.st_size;`
`379`	`379`	`}`
`380`	`380`	`//大小是否足够`
`@@ -412,9 +412,9 @@ BOOL CSession_UPStroage::Session_UPStroage_Close(LPCTSTR lpszClientAddr)`
`412`	`412`	`{`
`413`	`413`	`fclose(stl_MapIterator->second.st_StorageInfo.pSt_File);`
`414`	`414`	`}`
`415`		`- struct __stat64 st_FStat;`
`416`		`- memset(&st_FStat, '\0', sizeof(struct __stat64));`
`417`		`- _stat64(stl_MapIterator->second.st_StorageInfo.tszFileDir, &st_FStat);`
	`415`	`+ struct _tstat64 st_FStat;`
	`416`	`+ memset(&st_FStat, '\0', sizeof(struct _tstat64));`
	`417`	`+ _tstat64(stl_MapIterator->second.st_StorageInfo.tszFileDir, &st_FStat);`
`418`	`418`	`stl_MapIterator->second.st_StorageInfo.ullFSize = st_FStat.st_size;`
`419`	`419`	`}`
`420`	`420`	`st_Locker.unlock();`