From: Holger Schemel <info@artsoft.org>
Date: Sun, 17 Feb 2019 20:38:44 +0000 (+0100)
Subject: fixed compilation problems of minizip code on Linux
X-Git-Tag: 4.1.2.0~6
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=1b050fd79304752f4662850e2c21f6b19b79330d;p=rocksndiamonds.git

fixed compilation problems of minizip code on Linux
---

diff --git a/src/libgame/zip/ioapi.h b/src/libgame/zip/ioapi.h
index 3527ad63..0741de44 100644
--- a/src/libgame/zip/ioapi.h
+++ b/src/libgame/zip/ioapi.h
@@ -16,22 +16,6 @@
 #ifndef _ZLIBIOAPI64_H
 #define _ZLIBIOAPI64_H
 
-#if defined(__linux__)
-// Linux needs this to support file operation on files larger then 4+GB
-#  ifndef __USE_FILE_OFFSET64
-#  define __USE_FILE_OFFSET64
-#  endif
-#  ifndef __USE_LARGEFILE64
-#  define __USE_LARGEFILE64
-#  endif
-#  ifndef _LARGEFILE64_SOURCE
-#  define _LARGEFILE64_SOURCE
-#  endif
-#  ifndef _FILE_OFFSET_BIT
-#  define _FILE_OFFSET_BIT 64
-#  endif
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -49,7 +33,7 @@
 #  define ftello64 ftell
 #  define fseeko64 fseek
 #else
-#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__ANDROID__)
+#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__ANDROID__) || defined(__linux__)
 #    define fopen64 fopen
 #    define ftello64 ftello
 #    define fseeko64 fseeko
diff --git a/src/libgame/zip/miniunz.c b/src/libgame/zip/miniunz.c
index 478d4a8f..b068486e 100644
--- a/src/libgame/zip/miniunz.c
+++ b/src/libgame/zip/miniunz.c
@@ -16,22 +16,6 @@
    See the accompanying LICENSE file for the full text of the license.
 */
 
-#if defined(__linux__)
-// Linux needs this to support file operation on files larger then 4+GB
-#  ifndef __USE_FILE_OFFSET64
-#  define __USE_FILE_OFFSET64
-#  endif
-#  ifndef __USE_LARGEFILE64
-#  define __USE_LARGEFILE64
-#  endif
-#  ifndef _LARGEFILE64_SOURCE
-#  define _LARGEFILE64_SOURCE
-#  endif
-#  ifndef _FILE_OFFSET_BIT
-#  define _FILE_OFFSET_BIT 64
-#  endif
-#endif
-
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>