diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-01 10:11:18 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-01 10:11:18 (GMT) |
| commit | 493585e80285a37fffbfa04f560a2d37a94d3322 (patch) | |
| tree | 4cac51456b9bc7f4f618a385590876f818571ad8 /compat | |
| parent | ac8455a02203f9c430ec83a59810d8385d96af90 (diff) | |
| parent | 92be9569b81be3e3c9c99455ad609fe5f8e2e76e (diff) | |
| download | tcl-493585e80285a37fffbfa04f560a2d37a94d3322.zip tcl-493585e80285a37fffbfa04f560a2d37a94d3322.tar.gz tcl-493585e80285a37fffbfa04f560a2d37a94d3322.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/zlib/contrib/minizip/ioapi.c | 6 | ||||
| -rw-r--r-- | compat/zlib/contrib/minizip/minizip.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/compat/zlib/contrib/minizip/ioapi.c b/compat/zlib/contrib/minizip/ioapi.c index 7f5c191..8274a3d 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/contrib/minizip/minizip.c b/compat/zlib/contrib/minizip/minizip.c index 8a31582..7ce0b97 100644 --- a/compat/zlib/contrib/minizip/minizip.c +++ b/compat/zlib/contrib/minizip/minizip.c @@ -27,7 +27,11 @@ #endif #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) |