From 4df5acd7d276a899f8c8b6582cb647f0448b3ba7 Mon Sep 17 00:00:00 2001 From: Andrey Filipenkov Date: Sat, 23 Nov 2024 19:51:31 +0300 Subject: Don't use *64 functions on Android before API level 24. --- contrib/minizip/ioapi.c | 2 +- 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 @@ #define _CRT_SECURE_NO_WARNINGS #endif -#if defined(__APPLE__) || defined(IOAPI_NO_64) || defined(__HAIKU__) || defined(MINIZIP_FOPEN_NO_64) +#if defined(__APPLE__) || defined(IOAPI_NO_64) || defined(__HAIKU__) || defined(MINIZIP_FOPEN_NO_64) || (defined(__ANDROID_API__) && __ANDROID_API__ < 24) /* 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/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 @@ #ifndef ZLIBIOAPI64_H #define ZLIBIOAPI64_H -#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) +#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) && (!(defined(__ANDROID_API__) || __ANDROID_API__ >= 24)) /* Linux needs this to support file operation on files larger then 4+GB */ /* But might need better if/def to select just the platforms that needs them.*/ -- cgit v1.2.3-55-g6feb