From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Fri, 4 Feb 2022 01:57:31 +0000 (-0800)
Subject: Remove duplicate header includes.
X-Git-Tag: 2.1.0-beta1~385
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=405f11bfbf973022f575350bb6873ae847be549d;p=thirdparty%2Fzlib-ng.git

Remove duplicate header includes.
---

diff --git a/arch/x86/crc32_fold_pclmulqdq.c b/arch/x86/crc32_fold_pclmulqdq.c
index 2548bfbe..1ac90b34 100644
--- a/arch/x86/crc32_fold_pclmulqdq.c
+++ b/arch/x86/crc32_fold_pclmulqdq.c
@@ -19,7 +19,6 @@
 #ifdef X86_PCLMULQDQ_CRC
 #include "../../zbuild.h"
 
-#include <stdint.h>
 #include <immintrin.h>
 #include <wmmintrin.h>
 #include <smmintrin.h> // _mm_extract_epi32
diff --git a/crc32.c b/crc32.c
index b962fb6b..493c00c9 100644
--- a/crc32.c
+++ b/crc32.c
@@ -11,7 +11,6 @@
 
 #include "zbuild.h"
 #include "zendian.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 7a6b68a9..832dbbbc 100644
--- a/crc32_comb.c
+++ b/crc32_comb.c
@@ -10,7 +10,6 @@
  */
 
 #include "zbuild.h"
-#include <stdint.h>
 #include "deflate.h"
 #include "crc32_p.h"
 #include "crc32_comb_tbl.h"
diff --git a/deflate_medium.c b/deflate_medium.c
index c8d3e770..1bb21c24 100644
--- a/deflate_medium.c
+++ b/deflate_medium.c
@@ -7,7 +7,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 #ifndef NO_MEDIUM_STRATEGY
-#include <stdint.h>
 #include "zbuild.h"
 #include "deflate.h"
 #include "deflate_p.h"
diff --git a/test/benchmarks/benchmark_adler32.cc b/test/benchmarks/benchmark_adler32.cc
index c3fc46dc..780c0a21 100644
--- a/test/benchmarks/benchmark_adler32.cc
+++ b/test/benchmarks/benchmark_adler32.cc
@@ -3,9 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#include <stdint.h>
 #include <stdio.h>
-#include <stdint.h>
 #include <assert.h>
 
 #include <benchmark/benchmark.h>
diff --git a/test/benchmarks/benchmark_compare256.cc b/test/benchmarks/benchmark_compare256.cc
index 0166816d..09a81883 100644
--- a/test/benchmarks/benchmark_compare256.cc
+++ b/test/benchmarks/benchmark_compare256.cc
@@ -3,9 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#include <stdint.h>
 #include <stdio.h>
-#include <stdint.h>
 
 #include <benchmark/benchmark.h>
 
diff --git a/test/benchmarks/benchmark_crc32.cc b/test/benchmarks/benchmark_crc32.cc
index 68ad3f0f..57f8fd86 100644
--- a/test/benchmarks/benchmark_crc32.cc
+++ b/test/benchmarks/benchmark_crc32.cc
@@ -3,9 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#include <stdint.h>
 #include <stdio.h>
-#include <stdint.h>
 #include <assert.h>
 
 #include <benchmark/benchmark.h>
diff --git a/test/benchmarks/benchmark_main.cc b/test/benchmarks/benchmark_main.cc
index fa8195e0..600ac228 100644
--- a/test/benchmarks/benchmark_main.cc
+++ b/test/benchmarks/benchmark_main.cc
@@ -3,9 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#include <stdint.h>
 #include <stdio.h>
-#include <stdint.h>
 
 #include <benchmark/benchmark.h>
 
diff --git a/test/benchmarks/benchmark_slidehash.cc b/test/benchmarks/benchmark_slidehash.cc
index 195e7475..516da80b 100644
--- a/test/benchmarks/benchmark_slidehash.cc
+++ b/test/benchmarks/benchmark_slidehash.cc
@@ -3,10 +3,10 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#include <stdint.h>
-#include <stdint.h>
 #include <limits.h>
 
+#include <benchmark/benchmark.h>
+
 extern "C" {
 #  include "zbuild.h"
 #  include "zutil.h"
@@ -15,8 +15,6 @@ extern "C" {
 #  include "cpu_features.h"
 }
 
-#include <benchmark/benchmark.h>
-
 #define MAX_RANDOM_INTS 32768
 
 class slide_hash: public benchmark::Fixture {
diff --git a/test/fuzz/fuzzer_example_flush.c b/test/fuzz/fuzzer_example_flush.c
index 5546a653..baa6988e 100644
--- a/test/fuzz/fuzzer_example_flush.c
+++ b/test/fuzz/fuzzer_example_flush.c
@@ -1,9 +1,5 @@
 #include <stdio.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
 #include <assert.h>
-#include <stdlib.h>
 
 #include "zbuild.h"
 #ifdef ZLIB_COMPAT