diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-10-12 17:54:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-10-12 17:54:42 (GMT) |
| commit | cc945fabb73c3733169f7441140a7b2f2c57572c (patch) | |
| tree | 3641ec6151d50a51e2507d6e106a5c2f5a0025e1 /compat/zlib | |
| parent | 621251ae2e2fd50bbee979906ce537aae53f1e33 (diff) | |
| download | tcl-cc945fabb73c3733169f7441140a7b2f2c57572c.zip tcl-cc945fabb73c3733169f7441140a7b2f2c57572c.tar.gz tcl-cc945fabb73c3733169f7441140a7b2f2c57572c.tar.bz2 | |
Fix test for UNICODE in win/tclAppInit.c. No longer check for "tclsh install", because tclsh is not compiled with that. Fix minizip.c compilation on systems without open64()
Diffstat (limited to 'compat/zlib')
| -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); |