[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 95e873519a3bec4cb01d66c95f27acbd96c6301b..59975eec0d5de40cf184c94c6ea85be696a28ea1 100644 (file)
--- 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;