From 92aa5d1cafd965b044d04c3767981837d3b0d709 Mon Sep 17 00:00:00 2001
From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Thu, 17 Mar 2022 17:16:11 -0700
Subject: [PATCH] Use zutil.h which already includes zlib headers.

---
 arch/s390/dfltcc_common.h | 5 -----
 compress.c                | 5 -----
 uncompr.c                 | 6 +-----
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/arch/s390/dfltcc_common.h b/arch/s390/dfltcc_common.h
index 6de8bb18..df4b8b57 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 fded2a4c..db13f6ca 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 0053ef98..54ed57fd 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
-- 
2.47.2