From: Mika Lindqvist <postmaster@raasu.org>
Date: Fri, 16 Feb 2018 15:15:46 +0000 (+0200)
Subject: [compat] Don't check for ZLIB_COMPAT
X-Git-Tag: 1.9.9-b1~641
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad6ff9c07b26dcc9437f5b375c4e46cc2e0129de;p=thirdparty%2Fzlib-ng.git

[compat] Don't check for ZLIB_COMPAT
* ZLIB_COMPAT is always implied if using zlib.h
* Revert z_stream->adler to "unsigned long" to enforce correct alignment
  of struct members
---

diff --git a/zlib.h b/zlib.h
index 95e87351..59975eec 100644
--- a/zlib.h
+++ b/zlib.h
@@ -108,10 +108,7 @@ typedef struct z_stream_s {
 
     int                   data_type;  /* best guess about the data type: binary or text
                                          for deflate, or the decoding state for inflate */
-    uint32_t              adler;      /* Adler-32 or CRC-32 value of the uncompressed data */
-#if defined(ZLIB_COMPAT) && defined(X86_64)
-    uint32_t              padding;    /* pad out to the same size as the zlib struct */
-#endif
+    unsigned long         adler;      /* Adler-32 or CRC-32 value of the uncompressed data */
     unsigned long         reserved;   /* reserved for future use */
 } z_stream;