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

ccawley2011 · Dec 19, 2021 · 839c4ec · 839c4ec
1 parent 5b0ffa6
commit 839c4ec
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -7,7 +7,6 @@
 #ifdef ZLIB_DEBUG
 #  include <ctype.h>
 #  include <inttypes.h>
-#  include <stdint.h>
 #endif