summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2022-10-19 07:28:18 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2022-10-19 07:28:18 (GMT)
commitf1c94fa67e7f4a99e9bbb00223c9beb83f69fab2 (patch)
tree8eea7836f3929ff65161027661481687918ee7f2
parent6a9dc785dc6069702330f2a6ec66b1717afbfbd7 (diff)
downloadtcl-f1c94fa67e7f4a99e9bbb00223c9beb83f69fab2.zip
tcl-f1c94fa67e7f4a99e9bbb00223c9beb83f69fab2.tar.gz
tcl-f1c94fa67e7f4a99e9bbb00223c9beb83f69fab2.tar.bz2
Make minizip/ioapi.c work (again) on win32. Build zlib1.dll for win64-arm
-rw-r--r--compat/zlib/contrib/minizip/ioapi.c6
-rwxr-xr-xcompat/zlib/win64-arm/zlib1.dllbin95232 -> 95232 bytes
2 files changed, 5 insertions, 1 deletions
diff --git a/compat/zlib/contrib/minizip/ioapi.c b/compat/zlib/contrib/minizip/ioapi.c
index 814a6fd..9370ae2 100644
--- a/compat/zlib/contrib/minizip/ioapi.c
+++ b/compat/zlib/contrib/minizip/ioapi.c
@@ -14,7 +14,11 @@
#define _CRT_SECURE_NO_WARNINGS
#endif
-#if defined(__APPLE__) || defined(IOAPI_NO_64)
+#if defined(_WIN32)
+#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
+#define FTELLO_FUNC(stream) _ftelli64(stream)
+#define FSEEKO_FUNC(stream, offset, origin) _fseeki64(stream, offset, origin)
+#elif defined(__APPLE__) || defined(IOAPI_NO_64)
// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
#define FTELLO_FUNC(stream) ftello(stream)
diff --git a/compat/zlib/win64-arm/zlib1.dll b/compat/zlib/win64-arm/zlib1.dll
index 9025467..32d70b4 100755
--- a/compat/zlib/win64-arm/zlib1.dll
+++ b/compat/zlib/win64-arm/zlib1.dll
Binary files differ