summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Kristian Rosbach <hk-git@circlestorm.org>2021-12-13 16:46:21 +0100
committerHans Kristian Rosbach <hk-github@circlestorm.org>2021-12-19 15:40:19 +0100
commit839c4ec9985cc7de4a9008143b67af2f4e816153 (patch)
tree05d7aba9007f4c5aa13d2afe920fad4335649596
parent5b0ffa63f22d4870ae68de38c34f7ec437e7edb1 (diff)
downloadProject-Tick-839c4ec9985cc7de4a9008143b67af2f4e816153.tar.gz
Project-Tick-839c4ec9985cc7de4a9008143b67af2f4e816153.zip
inttypes.h includes stdint.h, so only include one of them.
-rw-r--r--arch/x86/crc32_fold_pclmulqdq.c2
-rw-r--r--crc32.c2
-rw-r--r--crc32_comb.c2
-rw-r--r--test/example.c3
-rw-r--r--test/fuzz/checksum_fuzzer.c1
-rw-r--r--test/fuzz/compress_fuzzer.c1
-rw-r--r--test/fuzz/example_dict_fuzzer.c1
-rw-r--r--test/fuzz/example_flush_fuzzer.c1
-rw-r--r--test/fuzz/example_large_fuzzer.c1
-rw-r--r--test/fuzz/example_small_fuzzer.c1
-rw-r--r--test/infcover.c1
-rw-r--r--test/minideflate.c1
-rw-r--r--trees_emit.h1
13 files changed, 4 insertions, 14 deletions
diff --git a/arch/x86/crc32_fold_pclmulqdq.c b/arch/x86/crc32_fold_pclmulqdq.c
index 9065298f50..0e261d4069 100644
--- 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 c519d874aa..c9a81d37b0 100644
--- 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 092c595d9c..fa11b9b222 100644
--- 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 6324a33c60..3963fc2f9f 100644
--- 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 da9f13059c..5874bb5335 100644
--- 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 9712e882a1..11fb19f0f3 100644
--- 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 da1bb06c96..65df26a646 100644
--- 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 81ec7e36d5..5546a6535b 100644
--- 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 bd27a84f12..864b84126a 100644
--- 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 d02a812de6..a4547feaf1 100644
--- 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 72a4c575be..0c355aa99c 100644
--- 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 ae04a29e89..36c27f9046 100644
--- 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 c957770878..922daae509 100644
--- 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