From: Mark Adler <madler@alumni.caltech.edu>
Date: Sat, 21 Jan 2012 19:54:52 +0000 (-0800)
Subject: Avoid some warnings in contrib/minizip [Vollant].
X-Git-Tag: v1.2.6~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de6cb6fe5c0b209c0337a78294017c38efd54c6b;p=thirdparty%2Fzlib-ng.git

Avoid some warnings in contrib/minizip [Vollant].
---

diff --git a/contrib/minizip/ioapi.c b/contrib/minizip/ioapi.c
index 49ec64af8..7f5c191b2 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)