Use zutil.h which already includes zlib headers.

diff --git a/arch/s390/dfltcc_common.h b/arch/s390/dfltcc_common.h
index 6de8bb18f6518122ed23dcb68cb3cdd6c3ea4e47..df4b8b5784454e0130037c95f44045567ab5dd60 100644 (file)
--- a/arch/s390/dfltcc_common.h
+++ b/arch/s390/dfltcc_common.h
@@ -1,11 +1,6 @@
 #ifndef DFLTCC_COMMON_H
 #define DFLTCC_COMMON_H
 
-#ifdef ZLIB_COMPAT
-#include "zlib.h"
-#else
-#include "zlib-ng.h"
-#endif
 #include "zutil.h"
 
 void Z_INTERNAL *dfltcc_alloc_state(PREFIX3(streamp) strm, uInt items, uInt size);

diff --git a/compress.c b/compress.c
index fded2a4cdf65b37cd1d76e050c94a1c239da8f0e..db13f6ca22c0c37c9dfb8926c5acf263cb4cb789 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -5,11 +5,6 @@
 
 #include "zbuild.h"
 #include "zutil.h"
-#if defined(ZLIB_COMPAT)
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
 
 /* ===========================================================================
  *  Architecture-specific hooks.

diff --git a/uncompr.c b/uncompr.c
index 0053ef982777308257d0996c1b03f0c3d340c097..54ed57fdbd4eb65926dd3908fc36b74d575cf8ee 100644 (file)
--- a/uncompr.c
+++ b/uncompr.c
@@ -4,11 +4,7 @@
  */
 
 #include "zbuild.h"
-#ifdef ZLIB_COMPAT
-#  include "zlib.h"
-#else
-#  include "zlib-ng.h"
-#endif
+#include "zutil.h"
 
 /* ===========================================================================
      Decompresses the source buffer into the destination buffer.  *sourceLen is