diff options
| author | Andrey Filipenkov <decapitator@ukr.net> | 2024-11-23 19:51:31 +0300 |
|---|---|---|
| committer | Mark Adler <git@madler.net> | 2026-02-11 15:16:57 -0800 |
| commit | 4df5acd7d276a899f8c8b6582cb647f0448b3ba7 (patch) | |
| tree | 3d78cadd496cac3d62b817dcb746c3de83725f9f | |
| parent | 249e7533cb90dc59122e7613817013240e0f0aab (diff) | |
| download | zlib-4df5acd7d276a899f8c8b6582cb647f0448b3ba7.tar.gz zlib-4df5acd7d276a899f8c8b6582cb647f0448b3ba7.tar.bz2 zlib-4df5acd7d276a899f8c8b6582cb647f0448b3ba7.zip | |
Don't use *64 functions on Android before API level 24.
| -rw-r--r-- | contrib/minizip/ioapi.c | 2 | ||||
| -rw-r--r-- | contrib/minizip/ioapi.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/minizip/ioapi.c b/contrib/minizip/ioapi.c index 3dbefe48..9c2e1b27 100644 --- a/contrib/minizip/ioapi.c +++ b/contrib/minizip/ioapi.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | #define _CRT_SECURE_NO_WARNINGS | 14 | #define _CRT_SECURE_NO_WARNINGS |
| 15 | #endif | 15 | #endif |
| 16 | 16 | ||
| 17 | #if defined(__APPLE__) || defined(IOAPI_NO_64) || defined(__HAIKU__) || defined(MINIZIP_FOPEN_NO_64) | 17 | #if defined(__APPLE__) || defined(IOAPI_NO_64) || defined(__HAIKU__) || defined(MINIZIP_FOPEN_NO_64) || (defined(__ANDROID_API__) && __ANDROID_API__ < 24) |
| 18 | /* In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions */ | 18 | /* In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions */ |
| 19 | #define FOPEN_FUNC(filename, mode) fopen(filename, mode) | 19 | #define FOPEN_FUNC(filename, mode) fopen(filename, mode) |
| 20 | #define FTELLO_FUNC(stream) ftello(stream) | 20 | #define FTELLO_FUNC(stream) ftello(stream) |
diff --git a/contrib/minizip/ioapi.h b/contrib/minizip/ioapi.h index 6b9968c7..66c16c1a 100644 --- a/contrib/minizip/ioapi.h +++ b/contrib/minizip/ioapi.h | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #ifndef ZLIBIOAPI64_H | 21 | #ifndef ZLIBIOAPI64_H |
| 22 | #define ZLIBIOAPI64_H | 22 | #define ZLIBIOAPI64_H |
| 23 | 23 | ||
| 24 | #if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) | 24 | #if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) && (!(defined(__ANDROID_API__) || __ANDROID_API__ >= 24)) |
| 25 | 25 | ||
| 26 | /* Linux needs this to support file operation on files larger then 4+GB */ | 26 | /* Linux needs this to support file operation on files larger then 4+GB */ |
| 27 | /* But might need better if/def to select just the platforms that needs them.*/ | 27 | /* But might need better if/def to select just the platforms that needs them.*/ |