| diff -ruN a/contrib/minizip/ioapi.h b/contrib/minizip/ioapi.h |
| --- 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__)) |
| |
| // 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. |
| diff -ruN a/contrib/minizip/miniunz.c b/contrib/minizip/miniunz.c |
| --- a/contrib/minizip/miniunz.c |
| +++ b/contrib/minizip/miniunz.c |
| @@ -12,7 +12,7 @@ |
| Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) |
| */ |
| |
| -#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) |
| +#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) && (!defined(__ANDROID__)) |
| #ifndef __USE_FILE_OFFSET64 |
| #define __USE_FILE_OFFSET64 |
| #endif |
| @@ -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) |
| @@ -50,6 +50,7 @@ |
| # include <direct.h> |
| # include <io.h> |
| #else |
| +# include <sys/stat.h> |
| # include <unistd.h> |
| # include <utime.h> |
| #endif |
| diff -ruN a/contrib/minizip/minizip.c b/contrib/minizip/minizip.c |
| --- a/contrib/minizip/minizip.c |
| +++ b/contrib/minizip/minizip.c |
| @@ -13,7 +13,7 @@ |
| */ |
| |
| |
| -#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) |
| +#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) && (!defined(__ANDROID__)) |
| #ifndef __USE_FILE_OFFSET64 |
| #define __USE_FILE_OFFSET64 |
| #endif |
| @@ -28,7 +28,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) |