Remove more workarounds for really old compilers

diff --git a/test/minigzip.c b/test/minigzip.c
index 227605d3a9e491c0aea30f62df52c6c7bc5a7bd0..9037681fbfa499d1cc135b350f8d8386b2fd988b 100644 (file)
--- 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 8bd4879286d10fabcd87a77bded27d5cfd699839..16d90ee48d559b98475a018bad614e300f90b17f 100644 (file)
--- 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 19386ad263c7bad46aaa9541575f281e4b461014..f80587c91eb4e9af9b77f44c152af50f02e82329 100644 (file)
--- 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 8bd4879286d10fabcd87a77bded27d5cfd699839..16d90ee48d559b98475a018bad614e300f90b17f 100644 (file)
--- 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