From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Tue, 12 May 2015 14:03:14 +0000 (+0200)
Subject: Minor cleanup of includefiles relating mostly to stdint.h
X-Git-Tag: 1.9.9-b1~837
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d376be237b615e6669d95b4c758e63155a16fccc;p=thirdparty%2Fzlib-ng.git

Minor cleanup of includefiles relating mostly to stdint.h
---

diff --git a/adler32.c b/adler32.c
index e502919cd..49b54417a 100644
--- 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 b1d542554..03ee1578b 100644
--- 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 541f77c4f..013199739 100644
--- 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 9d37f6f65..0c74b359f 100644
--- 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