Updated zlib to 1.3.1

Updated version number and year.

README.md

@@ -19,8 +19,8 @@ Original author: **Anchorite (TeamX)**
     -s: create Fallout 1 DAT file
     -r: recurse into subdirectories
     -0..9: Compression method
-           (Fallout1: 0 - store, other numbers - compress (default)
-           (Fallout2: 0 - store, 1 - best speed, 9 - best compression (default)
+           (Fallout1: 0 - store, other numbers - compress (default))
+           (Fallout2: 0 - store, 1 - best speed, 9 - best compression (default))
     -p: extract without paths
     -d: extract files into specified directory
     -t: add files to specified directory of DAT file

src/dat2.cpp

@@ -41,8 +41,8 @@ int main(int argc, char* argv[])
 		return 1;
 	}
 	else {
-		printf("Fallout DAT file packer/unpacker, version 2.33\n");
-		printf("Copyright (C) 2004-2023, Anchorite (TeamX)\n");
+		printf("Fallout DAT file packer/unpacker, version 2.33a\n");
+		printf("Copyright (C) 2004-2024, Anchorite (TeamX)\n");
 		printf("anchorite2001@yandex.ru\n");
 		printf("\n");
 
@@ -169,8 +169,8 @@ void PrintUsage(char* lpszFileName)
 	printf("  -s: create Fallout 1 DAT file\n");
 	printf("  -r: recurse into subdirectories\n");
 	printf("  -0..9: Compression method\n");
-	printf("         (Fallout1: 0 - store, other numbers - compress (default)\n");
-	printf("         (Fallout2: 0 - store, 1 - best speed, 9 - best compression (default)\n");
+	printf("         (Fallout1: 0 - store, other numbers - compress (default))\n");
+	printf("         (Fallout2: 0 - store, 1 - best speed, 9 - best compression (default))\n");
 	printf("  -p: extract without paths\n");
 	printf("  -d: extract files into specified directory\n");
 	printf("  -t: add files to specified directory of DAT file\n");

src/zlib/zconf.h

@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
+ * Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -241,7 +241,11 @@
 #endif
 
 #ifdef Z_SOLO
-   typedef unsigned long z_size_t;
+#  ifdef _WIN64
+     typedef unsigned long long z_size_t;
+#  else
+     typedef unsigned long z_size_t;
+#  endif
 #else
 #  define z_longlong long long
 #  if defined(NO_SIZE_T)
@@ -296,14 +300,6 @@
 #  endif
 #endif
 
-#ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(args)  ()
-#  endif
-#endif
-
 /* The following definitions for FAR are needed only for MSDOS mixed
  * model programming (small or medium model with some far allocations).
  * This was tested only with MSC; for other MSDOS compilers you may have
@@ -520,7 +516,7 @@ typedef uLong FAR uLongf;
 #if !defined(_WIN32) && defined(Z_LARGE64)
 #  define z_off64_t off64_t
 #else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+#  if defined(_WIN32) && !defined(__GNUC__)
 #    define z_off64_t __int64
 #  else
 #    define z_off64_t z_off_t