summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2012-01-21 11:54:52 -0800
committerMark Adler <madler@alumni.caltech.edu>2012-01-21 11:58:45 -0800
commitde6cb6fe5c0b209c0337a78294017c38efd54c6b (patch)
treefaf93a0e35c4e973d1b2751d63f94517e6cd2f27
parent601b542a9d6c3689fce1414ec089d5f193656faa (diff)
downloadzlib-de6cb6fe5c0b209c0337a78294017c38efd54c6b.tar.gz
Avoid some warnings in contrib/minizip [Vollant].
-rw-r--r--contrib/minizip/ioapi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/minizip/ioapi.c b/contrib/minizip/ioapi.c
index 49ec64a..7f5c191 100644
--- a/contrib/minizip/ioapi.c
+++ b/contrib/minizip/ioapi.c
@@ -10,11 +10,11 @@
*/
-#if (defined(_WIN32))
+#if defined(_WIN32) && (!(defined(_CRT_SECURE_NO_WARNINGS)))
#define _CRT_SECURE_NO_WARNINGS
#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)