From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Fri, 18 Mar 2022 00:16:11 +0000 (-0700)
Subject: Use zutil.h which already includes zlib headers.
X-Git-Tag: 2.1.0-beta1~324
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92aa5d1cafd965b044d04c3767981837d3b0d709;p=thirdparty%2Fzlib-ng.git

Use zutil.h which already includes zlib headers.
---

diff --git a/arch/s390/dfltcc_common.h b/arch/s390/dfltcc_common.h
index 6de8bb18f..df4b8b578 100644
--- 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 fded2a4cd..db13f6ca2 100644
--- 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 0053ef982..54ed57fdb 100644
--- 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