]> git.ipfire.org Git - thirdparty/zlib-ng.git/commitdiff
Avoid some warnings in contrib/minizip [Vollant].
authorMark Adler <madler@alumni.caltech.edu>
Sat, 21 Jan 2012 19:54:52 +0000 (11:54 -0800)
committerMark Adler <madler@alumni.caltech.edu>
Sat, 21 Jan 2012 19:58:45 +0000 (11:58 -0800)
contrib/minizip/ioapi.c

index 49ec64af8ad96dea3bce5cea6a665a780c1e3e20..7f5c191b2afd1624a653afafad3fef722e864bc3 100644 (file)
 
 */
 
-#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)