diff options
| author | Gilles Vollant <info@winimage.com> | 2023-07-29 11:17:19 +0200 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2023-08-03 11:17:07 -0700 |
| commit | aa154e3da0d98629bbefe79cdfba8bc7178dc4ad (patch) | |
| tree | b07d70b2a8aae22e0579e573158e719954ae37bf | |
| parent | f679a939d3db557fec0304602a179f0ac78e5afa (diff) | |
| download | zlib-aa154e3da0d98629bbefe79cdfba8bc7178dc4ad.tar.gz zlib-aa154e3da0d98629bbefe79cdfba8bc7178dc4ad.tar.bz2 zlib-aa154e3da0d98629bbefe79cdfba8bc7178dc4ad.zip | |
Support Haiku in minizip.
| -rw-r--r-- | contrib/minizip/ioapi.c | 2 | ||||
| -rw-r--r-- | contrib/minizip/ioapi.h | 2 | ||||
| -rw-r--r-- | contrib/minizip/miniunz.c | 2 | ||||
| -rw-r--r-- | contrib/minizip/minizip.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/contrib/minizip/ioapi.c b/contrib/minizip/ioapi.c index 629e51e..782d324 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) | 17 | #if defined(__APPLE__) || defined(IOAPI_NO_64) || defined(__HAIKU__) || defined(MINIZIP_FOPEN_NO_64) |
| 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 bb2ad3c..c588a18 100644 --- a/contrib/minizip/ioapi.h +++ b/contrib/minizip/ioapi.h | |||
| @@ -50,7 +50,7 @@ | |||
| 50 | #define ftello64 ftell | 50 | #define ftello64 ftell |
| 51 | #define fseeko64 fseek | 51 | #define fseeko64 fseek |
| 52 | #else | 52 | #else |
| 53 | #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) | 53 | #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__HAIKU__) || defined(MINIZIP_FOPEN_NO_64) |
| 54 | #define fopen64 fopen | 54 | #define fopen64 fopen |
| 55 | #define ftello64 ftello | 55 | #define ftello64 ftello |
| 56 | #define fseeko64 fseeko | 56 | #define fseeko64 fseeko |
diff --git a/contrib/minizip/miniunz.c b/contrib/minizip/miniunz.c index 4bb080b..4f18b30 100644 --- a/contrib/minizip/miniunz.c +++ b/contrib/minizip/miniunz.c | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #endif | 27 | #endif |
| 28 | #endif | 28 | #endif |
| 29 | 29 | ||
| 30 | #ifdef __APPLE__ | 30 | #if defined(__APPLE__) || defined(__HAIKU__) || defined(MINIZIP_FOPEN_NO_64) |
| 31 | // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions | 31 | // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions |
| 32 | #define FOPEN_FUNC(filename, mode) fopen(filename, mode) | 32 | #define FOPEN_FUNC(filename, mode) fopen(filename, mode) |
| 33 | #define FTELLO_FUNC(stream) ftello(stream) | 33 | #define FTELLO_FUNC(stream) ftello(stream) |
diff --git a/contrib/minizip/minizip.c b/contrib/minizip/minizip.c index 896c28e..7b5e3eb 100644 --- a/contrib/minizip/minizip.c +++ b/contrib/minizip/minizip.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #endif | 28 | #endif |
| 29 | #endif | 29 | #endif |
| 30 | 30 | ||
| 31 | #ifdef __APPLE__ | 31 | #if defined(__APPLE__) || defined(__HAIKU__) || defined(MINIZIP_FOPEN_NO_64) |
| 32 | // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions | 32 | // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions |
| 33 | #define FOPEN_FUNC(filename, mode) fopen(filename, mode) | 33 | #define FOPEN_FUNC(filename, mode) fopen(filename, mode) |
| 34 | #define FTELLO_FUNC(stream) ftello(stream) | 34 | #define FTELLO_FUNC(stream) ftello(stream) |