Minor cleanup of includefiles relating mostly to stdint.h

diff --git a/adler32.c b/adler32.c
index e502919cdcd87feb579e3f84d99578815c7f670d..49b54417a42548b3d37efb142947818334b0f5a8 100644 (file)
--- a/adler32.c
+++ b/adler32.c
@@ -6,7 +6,6 @@
 /* @(#) $Id$ */
 
 #include "zutil.h"
-#include <stdint.h>
 
 static uint32_t adler32_combine_ (uint32_t adler1, uint32_t adler2, z_off64_t len2);
 

diff --git a/crc32.c b/crc32.c
index b1d542554493713a86c82f050c1f3320fd47c85c..03ee1578bb10102f2347d0ba66db0ff53aeb539b 100644 (file)
--- a/crc32.c
+++ b/crc32.c
@@ -42,8 +42,7 @@
 #  endif /* !DYNAMIC_CRC_TABLE */
 #endif /* MAKECRCH */
 
-#include "zutil.h"
-#include <stdint.h>
+#include "deflate.h"
 
 #if BYTE_ORDER == LITTLE_ENDIAN
 static uint32_t crc32_little (uint32_t, const unsigned char *, unsigned);
@@ -423,7 +422,6 @@ uint32_t ZEXPORT crc32_combine64(crc1, crc2, len2)
     return crc32_combine_(crc1, crc2, len2);
 }
 
-#include "deflate.h"
 
 #ifdef X86_PCLMULQDQ_CRC
 #include "arch/x86/x86.h"

diff --git a/match.c b/match.c
index 541f77c4f99cc159d84a7421817f38b4009f07bb..013199739e22789d84e93d5c38dd175c62a836e3 100644 (file)
--- a/match.c
+++ b/match.c
@@ -8,7 +8,6 @@
  * OUT assertion: the match length is not greater than s->lookahead
  */
 
-#include <stdint.h>
 #include "deflate.h"
 
 #if (defined(UNALIGNED_OK) && MAX_MATCH == 258)

diff --git a/zutil.h b/zutil.h
index 9d37f6f6557d6ac66c47669c41ac363cf1540e26..0c74b359f1a04e9b9cb97dbda0d0ac921800ef57 100644 (file)
--- a/zutil.h
+++ b/zutil.h
@@ -23,6 +23,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdint.h>
 
 #ifndef local
 #  define local static