diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-10-12 18:29:24 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-10-12 18:29:24 (GMT) |
| commit | da2d06ef7001453e949f73dff29d7f3720c11cee (patch) | |
| tree | 6120e0c0366c67e9287f917203aa1be8e26f3b55 /compat | |
| parent | 24d57ac2241711f505d3c2b6aa488a2b36062404 (diff) | |
| parent | 7fcc213b7aa1313c6bbe4ee2f794913e6776b0db (diff) | |
| download | tcl-da2d06ef7001453e949f73dff29d7f3720c11cee.zip tcl-da2d06ef7001453e949f73dff29d7f3720c11cee.tar.gz tcl-da2d06ef7001453e949f73dff29d7f3720c11cee.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/zlib/contrib/minizip/minizip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compat/zlib/contrib/minizip/minizip.c b/compat/zlib/contrib/minizip/minizip.c index b5c67cc..17582d0 100644 --- a/compat/zlib/contrib/minizip/minizip.c +++ b/compat/zlib/contrib/minizip/minizip.c @@ -27,7 +27,7 @@ #endif #endif -#ifdef __APPLE__ +#if 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) @@ -359,7 +359,7 @@ void addFileToZip(zipFile zf, const char *filenameinzip, const char *password, i void addPathToZip(zipFile zf, const char *filenameinzip, const char *password, int opt_exclude_path,int opt_compress_level) { tinydir_dir dir; int i; - char *newname[512]; + char newname[512]; tinydir_open_sorted(&dir, filenameinzip); |