From: hansr <hk-git@circlestorm.org>
Date: Wed, 15 Oct 2014 13:30:00 +0000 (+0200)
Subject: Remove more workarounds for really old compilers
X-Git-Tag: 1.9.9-b1~907
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2a42fe7cfee13746173f602b646fa77287de9d3;p=thirdparty%2Fzlib-ng.git

Remove more workarounds for really old compilers
---

diff --git a/test/minigzip.c b/test/minigzip.c
index 227605d3a..9037681fb 100644
--- a/test/minigzip.c
+++ b/test/minigzip.c
@@ -41,15 +41,6 @@
 #  define snprintf _snprintf
 #endif
 
-#ifdef RISCOS
-#  define unlink remove
-#  define GZ_SUFFIX "-gz"
-#  define fileno(file) file->__file
-#endif
-#if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-#  include <unix.h> /* for fileno */
-#endif
-
 #if !defined(Z_HAVE_UNISTD_H) && !defined(_LARGEFILE64_SOURCE)
 #ifndef WIN32 /* unlink already in stdio.h for WIN32 */
   extern int unlink (const char *);
diff --git a/zconf.h b/zconf.h
index 8bd487928..16d90ee48 100644
--- a/zconf.h
+++ b/zconf.h
@@ -239,18 +239,6 @@
 #  endif
 #endif
 
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
 #ifndef ZEXTERN
 #  define ZEXTERN extern
 #endif
diff --git a/zconf.h.cmakein b/zconf.h.cmakein
index 19386ad26..f80587c91 100644
--- a/zconf.h.cmakein
+++ b/zconf.h.cmakein
@@ -241,18 +241,6 @@
 #  endif
 #endif
 
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
 #ifndef ZEXTERN
 #  define ZEXTERN extern
 #endif
diff --git a/zconf.h.in b/zconf.h.in
index 8bd487928..16d90ee48 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -239,18 +239,6 @@
 #  endif
 #endif
 
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
 #ifndef ZEXTERN
 #  define ZEXTERN extern
 #endif