inttypes.h includes stdint.h, so only include one of them.

diff --git a/arch/x86/crc32_fold_pclmulqdq.c b/arch/x86/crc32_fold_pclmulqdq.c
index 9065298f500013d6faca6cbb95ff112c7540ea13..0e261d406996a649aef0fe8bd139dbadad362874 100644 (file)
--- a/arch/x86/crc32_fold_pclmulqdq.c
+++ b/arch/x86/crc32_fold_pclmulqdq.c
@@ -19,7 +19,7 @@
 #ifdef X86_PCLMULQDQ_CRC
 #include "../../zutil.h"
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <immintrin.h>
 #include <wmmintrin.h>
 

diff --git a/crc32.c b/crc32.c
index c519d874aa86a5c931f8c42e709b391f9009ab78..c9a81d37b07ebe54ed2a2da78058a64ec411783a 100644 (file)
--- a/crc32.c
+++ b/crc32.c
@@ -11,7 +11,7 @@
 
 #include "zbuild.h"
 #include "zendian.h"
-#include <inttypes.h>
+#include <stdint.h>
 #include "deflate.h"
 #include "functable.h"
 #include "crc32_tbl.h"

diff --git a/crc32_comb.c b/crc32_comb.c
index 092c595d9cd7db5fdfe2376a2a0e992cc347e10a..fa11b9b2224479b57c06dd97ebaa6e057f7b07e9 100644 (file)
--- a/crc32_comb.c
+++ b/crc32_comb.c
@@ -10,7 +10,7 @@
  */
 
 #include "zbuild.h"
-#include <inttypes.h>
+#include <stdint.h>
 #include "deflate.h"
 #include "crc32_p.h"
 #include "crc32_comb_tbl.h"

diff --git a/test/example.c b/test/example.c
index 6324a33c606657122df074081db4743ff451a10d..3963fc2f9fcf8386249fe7076d55d4c40b9eb33f 100644 (file)
--- a/test/example.c
+++ b/test/example.c
@@ -15,9 +15,8 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <inttypes.h>
-#include <stdint.h>
 #include <stdarg.h>
+#include <inttypes.h>
 
 #define TESTFILE "foo.gz"
 

diff --git a/test/fuzz/checksum_fuzzer.c b/test/fuzz/checksum_fuzzer.c
index da9f13059cca2e797d989f19125f5cabcd293b10..5874bb533529a1530d6318cc8107d5612c1b84d1 100644 (file)
--- a/test/fuzz/checksum_fuzzer.c
+++ b/test/fuzz/checksum_fuzzer.c
@@ -4,7 +4,6 @@
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
-#include <inttypes.h>
 
 #include "zbuild.h"
 #ifdef ZLIB_COMPAT

diff --git a/test/fuzz/compress_fuzzer.c b/test/fuzz/compress_fuzzer.c
index 9712e882a10005129929d598243df40e2c27e42c..11fb19f0f373ad18d04dca476626bdada84f15cf 100644 (file)
--- a/test/fuzz/compress_fuzzer.c
+++ b/test/fuzz/compress_fuzzer.c
@@ -4,7 +4,6 @@
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
-#include <inttypes.h>
 
 #include "zbuild.h"
 #ifdef ZLIB_COMPAT

diff --git a/test/fuzz/example_dict_fuzzer.c b/test/fuzz/example_dict_fuzzer.c
index da1bb06c96ca7d7e37fa0f6918b65dbddea53f51..65df26a6463a55a4350378f6b97c1ed344b8273b 100644 (file)
--- a/test/fuzz/example_dict_fuzzer.c
+++ b/test/fuzz/example_dict_fuzzer.c
@@ -4,7 +4,6 @@
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
-#include <inttypes.h>
 
 #include "zbuild.h"
 #ifdef ZLIB_COMPAT

diff --git a/test/fuzz/example_flush_fuzzer.c b/test/fuzz/example_flush_fuzzer.c
index 81ec7e36d516caa1736db40a1cea0d219f598cf5..5546a6535b83a433066de255829afa6cbdf719f1 100644 (file)
--- a/test/fuzz/example_flush_fuzzer.c
+++ b/test/fuzz/example_flush_fuzzer.c
@@ -4,7 +4,6 @@
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
-#include <inttypes.h>
 
 #include "zbuild.h"
 #ifdef ZLIB_COMPAT

diff --git a/test/fuzz/example_large_fuzzer.c b/test/fuzz/example_large_fuzzer.c
index bd27a84f12093a6080baa38fd5145a472712248d..864b84126a28033b637797662c569cbc14442799 100644 (file)
--- a/test/fuzz/example_large_fuzzer.c
+++ b/test/fuzz/example_large_fuzzer.c
@@ -1,6 +1,5 @@
 #include <stdio.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>

diff --git a/test/fuzz/example_small_fuzzer.c b/test/fuzz/example_small_fuzzer.c
index d02a812de642ea8fb0b0545942b4e3552b371085..a4547feaf10af6e63d9ffe5b399733ac8c5a45e7 100644 (file)
--- a/test/fuzz/example_small_fuzzer.c
+++ b/test/fuzz/example_small_fuzzer.c
@@ -4,7 +4,6 @@
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
-#include <inttypes.h>
 
 #include "zbuild.h"
 #ifdef ZLIB_COMPAT

diff --git a/test/infcover.c b/test/infcover.c
index 72a4c575be2f933e60695c180684db942eb933f1..0c355aa99c00caf4b5f361efcb121c684da335f6 100644 (file)
--- a/test/infcover.c
+++ b/test/infcover.c
@@ -11,7 +11,6 @@
 #undef NDEBUG
 #include <assert.h>
 #include <inttypes.h>
-#include <stdint.h>
 
 /* get definition of internal structure so we can mess with it (see pull()),
    and so we can call inflate_trees() (see cover5()) */

diff --git a/test/minideflate.c b/test/minideflate.c
index ae04a29e89588a9047cb3985a337a6acf0b17643..36c27f9046be3210314282c85cc02a27a810477b 100644 (file)
--- a/test/minideflate.c
+++ b/test/minideflate.c
@@ -12,7 +12,6 @@
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
-#include <inttypes.h>
 
 #include "zbuild.h"
 #ifdef ZLIB_COMPAT

diff --git a/trees_emit.h b/trees_emit.h
index c957770878db753a2d7e94f64c46600e937b2aeb..922daae509f520c8633829e3686ddb2fae688823 100644 (file)
--- a/trees_emit.h
+++ b/trees_emit.h
@@ -7,7 +7,6 @@
 #ifdef ZLIB_DEBUG
 #  include <ctype.h>
 #  include <inttypes.h>
-#  include <stdint.h>
 #endif