A few fixes to my previous patches. Including the small compile-breaker that I accidently threw in by putting an important global variable in a rarely used define (generations).

common/quakefs.c

@@ -61,10 +61,11 @@ QUAKE FILESYSTEM
 =============================================================================
 */
 
+char    gamedirfile[MAX_OSPATH];
+
 #ifdef GENERATIONS
 #include <unzip.h>
 typedef unsigned char byte_t;
-char	gamedirfile[MAX_OSPATH];
 
 #ifndef _AIX
 typedef unsigned int uint_t;
@@ -616,7 +617,7 @@ pack_t *COM_LoadPackZipFile (char *packfile)
 
 //	This following variable info is unused ATM.
 //	dpackfile_t            		info[MAX_FILES_IN_PACK];
-	char szCurrentFileName[256];
+	char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
 
 	pak = unzOpen(packfile);
 

common/unzip.c

@@ -35,7 +35,7 @@
 #define CASESENSITIVITYDEFAULT_NO
 #endif
 
-
+#if 0
 #ifndef UNZ_BUFSIZE
 #define UNZ_BUFSIZE (16384)
 #endif
@@ -43,6 +43,7 @@
 #ifndef UNZ_MAXFILENAMEINZIP
 #define UNZ_MAXFILENAMEINZIP (256)
 #endif
+#endif 
 
 #ifndef ALLOC
 # define ALLOC(size) (malloc(size))

common/unzip.h

@@ -49,6 +49,14 @@ extern "C" {
 #include <zlib.h>
 #endif
 
+#ifndef UNZ_BUFSIZE  
+#define UNZ_BUFSIZE (16384)
+#endif
+
+#ifndef UNZ_MAXFILENAMEINZIP
+#define UNZ_MAXFILENAMEINZIP (256)
+#endif
+
 #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
 /* like the STRICT of WIN32, we define a pointer that cannot be converted
     from (void*) without cast */