Replace remaining Z_NULL instances with NULL.

diff --git a/arch/x86/crc_pclmulqdq.c b/arch/x86/crc_pclmulqdq.c
index 04281ca5cffcc43609e0e81b7a1b328c185ef63e..a513d6cc3153f0214ddaa9856719e526fb7b5435 100644 (file)
--- a/arch/x86/crc_pclmulqdq.c
+++ b/arch/x86/crc_pclmulqdq.c
@@ -14,7 +14,7 @@ ZLIB_INTERNAL void crc_reset(deflate_state *const s) {
         crc_fold_init(s);
         return;
     }
-    s->strm->adler = crc32(0L, Z_NULL, 0);
+    s->strm->adler = crc32(0L, NULL, 0);
 }
 
 ZLIB_INTERNAL void crc_finalize(deflate_state *const s) {

diff --git a/crc32.c b/crc32.c
index 828459094490bbfe62597411b4bb98e1bb9e47a2..4f71b220297429060b6ab07196eeb19a6b7932ed 100644 (file)
--- a/crc32.c
+++ b/crc32.c
@@ -442,7 +442,7 @@ uint32_t ZEXPORT crc32_combine64(uint32_t crc1, uint32_t crc2, z_off64_t len2) {
 
 #ifndef X86_PCLMULQDQ_CRC
 ZLIB_INTERNAL void crc_reset(deflate_state *const s) {
-    s->strm->adler = crc32(0L, Z_NULL, 0);
+    s->strm->adler = crc32(0L, NULL, 0);
 }
 
 ZLIB_INTERNAL void copy_with_crc(z_stream *strm, unsigned char *dst, unsigned long size) {

diff --git a/deflate.c b/deflate.c
index a11b5ebda96d94f7131af1ffd144f86aedc21897..bd1c69a494acf81d79e0a4f2019fb17c62db337c 100644 (file)
--- a/deflate.c
+++ b/deflate.c
@@ -836,7 +836,7 @@ int ZEXPORT deflate(z_stream *strm, int flush) {
         }
     }
     if (s->status == EXTRA_STATE) {
-        if (s->gzhead->extra != Z_NULL) {
+        if (s->gzhead->extra != NULL) {
             uint32_t beg = s->pending;   /* start of bytes to update crc */
             uint32_t left = (s->gzhead->extra_len & 0xffff) - s->gzindex;