[LINUX][ZH] Fix compress tool compilation (#620)

Co-authored-by: Patrick Zacharias <[email protected]>

Author: feliwir

GeneralsMD/Code/Libraries/Source/Compression/EAC/huffencode.cpp

@@ -1050,8 +1050,8 @@ static void HUFF_pack(struct HuffEncodeContext *EC,
 		if (!i3)
 			HUFF_writecode(EC,dest,i);
 
-		if (((int) bptr1- (int) EC->buffer) >= (int)(EC->plen+curpc))
-			curpc = (int) bptr1 - (int) EC->buffer - EC->plen;
+		if (((long) bptr1- (long) EC->buffer) >= (long)(EC->plen+curpc))
+			curpc = (long) bptr1 - (long) EC->buffer - EC->plen;
 	}
 
 	/* write EOF ([clue] 0gn [10]) */

GeneralsMD/Code/Libraries/Source/Compression/LZHCompress/NoxCompress.cpp

@@ -47,7 +47,7 @@ Bool DecompressFile		(char *infile, char *outfile)
 	char *outBlock	= NULL;
 	LZHL_DHANDLE decompress;
 	Int ok = 0;
-	UnsignedInt srcSz, dstSz;
+	size_t srcSz, dstSz;
 
 	// Parameter checking
 
@@ -224,7 +224,7 @@ Bool DecompressMemory		(void *inBufferVoid, Int inSize, void *outBufferVoid, Int
 	UnsignedInt	rawSize = 0, compressedSize = 0;
 	LZHL_DHANDLE decompress;
 	Int ok = 0;
-	UnsignedInt srcSz, dstSz;
+	size_t srcSz, dstSz;
 
 	// Parameter checking
 

GeneralsMD/Code/Tools/CRCDiff/debug.cpp

@@ -20,9 +20,11 @@
 // Minmal debug info
 // Author: Matthew D. Campbell, Sept 2002
 
-#include <windows.h>
 #include "debug.h"
 #include <cstdio>
+#ifdef _WIN32
+#include <windows.h>
+#endif
 
 #ifdef DEBUG
 

GeneralsMD/Code/Tools/Compress/Compress.cpp

@@ -54,7 +54,7 @@ void dumpHelp(const char *exe)
 	}
 }
 
-void main(int argc, char **argv)
+int main(int argc, char **argv)
 {
 	std::string inFile = "";
 	std::string outFile = "";
@@ -65,7 +65,7 @@ void main(int argc, char **argv)
 		if ( !stricmp(argv[i], "-help") )
 		{
 			dumpHelp(argv[0]);
-			exit(0);
+			return EXIT_SUCCESS;
 		}
 
 		if ( !strcmp(argv[i], "-in") )
@@ -106,7 +106,7 @@ void main(int argc, char **argv)
 	if (inFile.empty())
 	{
 		dumpHelp(argv[0]);
-		exit(0);
+		return EXIT_SUCCESS;
 	}
 
 	DEBUG_LOG(("IN:'%s' OUT:'%s' Compression:'%s'\n",
@@ -119,7 +119,7 @@ void main(int argc, char **argv)
 		if (!fp)
 		{
 			DEBUG_LOG(("Cannot open '%s'\n", inFile.c_str()));
-			return;
+			return EXIT_FAILURE;
 		}
 		fseek(fp, 0, SEEK_END);
 		int size = ftell(fp);
@@ -131,14 +131,14 @@ void main(int argc, char **argv)
 		if (numRead != 8)
 		{
 			DEBUG_LOG(("Cannot read header from '%s'\n", inFile.c_str()));
-			return;
+			return EXIT_FAILURE;
 		}
 
 		CompressionType usedType = CompressionManager::getCompressionType(data, 8);
 		if (usedType == COMPRESSION_NONE)
 		{
 			DEBUG_LOG(("No compression on '%s'\n", inFile.c_str()));
-			return;
+			return EXIT_FAILURE;
 		}
 
 		int uncompressedSize = CompressionManager::getUncompressedSize(data, 8);
@@ -147,8 +147,9 @@ void main(int argc, char **argv)
 			inFile.c_str(), CompressionManager::getCompressionNameByType(usedType),
 			uncompressedSize, size, size/(double)(uncompressedSize+0.1)*100.0));
 
-		return;
+		return EXIT_SUCCESS;
 	}
 
 	// compress file
+	return EXIT_FAILURE;
 }