From eb0a024af2d84467b22484a89e98e25b3c38025a Mon Sep 17 00:00:00 2001
From: DRC <information@libjpeg-turbo.org>
Date: Tue, 4 Oct 2022 12:51:38 -0500
Subject: [PATCH] Remove redundant jconfigint.h #includes

Because of 607b668ff96e40fdc749de9b1bb98e7f40c86d93, jconfigint.h is
included by jinclude.h.
---
 cmyk.h                   | 1 -
 jccolor.c                | 1 -
 jchuff.c                 | 1 -
 jcmaster.c               | 1 -
 jcphuff.c                | 1 -
 jdapimin.c               | 1 -
 jdcolor.c                | 1 -
 jdmainct.c               | 1 -
 jdmerge.c                | 1 -
 simd/arm/aarch64/jsimd.c | 1 -
 simd/arm/jcphuff-neon.c  | 1 -
 simd/arm/jdcolor-neon.c  | 1 -
 simd/arm/jdmerge-neon.c  | 1 -
 simd/arm/jidctint-neon.c | 1 -
 simd/i386/jsimd.c        | 1 -
 simd/x86_64/jsimd.c      | 1 -
 turbojpeg.c              | 1 -
 17 files changed, 17 deletions(-)

diff --git a/cmyk.h b/cmyk.h
index 48187a8f..b6ca20f2 100644
--- a/cmyk.h
+++ b/cmyk.h
@@ -17,7 +17,6 @@
 #include <jinclude.h>
 #define JPEG_INTERNALS
 #include <jpeglib.h>
-#include "jconfigint.h"
 
 
 /* Fully reversible */
diff --git a/jccolor.c b/jccolor.c
index bdc563c7..519f970f 100644
--- a/jccolor.c
+++ b/jccolor.c
@@ -17,7 +17,6 @@
 #include "jinclude.h"
 #include "jpeglib.h"
 #include "jsimd.h"
-#include "jconfigint.h"
 
 
 /* Private subobject */
diff --git a/jchuff.c b/jchuff.c
index f4dfa1cb..5d0276ad 100644
--- a/jchuff.c
+++ b/jchuff.c
@@ -27,7 +27,6 @@
 #include "jinclude.h"
 #include "jpeglib.h"
 #include "jsimd.h"
-#include "jconfigint.h"
 #include <limits.h>
 
 /*
diff --git a/jcmaster.c b/jcmaster.c
index c2b26000..b821710a 100644
--- a/jcmaster.c
+++ b/jcmaster.c
@@ -19,7 +19,6 @@
 #include "jinclude.h"
 #include "jpeglib.h"
 #include "jpegcomp.h"
-#include "jconfigint.h"
 
 
 /* Private state */
diff --git a/jcphuff.c b/jcphuff.c
index 872e570b..ef32b5f8 100644
--- a/jcphuff.c
+++ b/jcphuff.c
@@ -22,7 +22,6 @@
 #include "jinclude.h"
 #include "jpeglib.h"
 #include "jsimd.h"
-#include "jconfigint.h"
 #include <limits.h>
 
 #ifdef HAVE_INTRIN_H
diff --git a/jdapimin.c b/jdapimin.c
index f50c27ed..30126a04 100644
--- a/jdapimin.c
+++ b/jdapimin.c
@@ -23,7 +23,6 @@
 #include "jinclude.h"
 #include "jpeglib.h"
 #include "jdmaster.h"
-#include "jconfigint.h"
 
 
 /*
diff --git a/jdcolor.c b/jdcolor.c
index 8da2b4ea..735190b7 100644
--- a/jdcolor.c
+++ b/jdcolor.c
@@ -18,7 +18,6 @@
 #include "jinclude.h"
 #include "jpeglib.h"
 #include "jsimd.h"
-#include "jconfigint.h"
 
 
 /* Private subobject */
diff --git a/jdmainct.c b/jdmainct.c
index f466b259..d332e6b2 100644
--- a/jdmainct.c
+++ b/jdmainct.c
@@ -18,7 +18,6 @@
 
 #include "jinclude.h"
 #include "jdmainct.h"
-#include "jconfigint.h"
 
 
 /*
diff --git a/jdmerge.c b/jdmerge.c
index 3a456d65..38b00272 100644
--- a/jdmerge.c
+++ b/jdmerge.c
@@ -42,7 +42,6 @@
 #include "jpeglib.h"
 #include "jdmerge.h"
 #include "jsimd.h"
-#include "jconfigint.h"
 
 #ifdef UPSAMPLE_MERGING_SUPPORTED
 
diff --git a/simd/arm/aarch64/jsimd.c b/simd/arm/aarch64/jsimd.c
index 6b12a79c..01ed5b1c 100644
--- a/simd/arm/aarch64/jsimd.c
+++ b/simd/arm/aarch64/jsimd.c
@@ -23,7 +23,6 @@
 #include "../../../jdct.h"
 #include "../../../jsimddct.h"
 #include "../../jsimd.h"
-#include "jconfigint.h"
 
 #include <ctype.h>
 
diff --git a/simd/arm/jcphuff-neon.c b/simd/arm/jcphuff-neon.c
index b91c5db4..548944f8 100644
--- a/simd/arm/jcphuff-neon.c
+++ b/simd/arm/jcphuff-neon.c
@@ -21,7 +21,6 @@
  */
 
 #define JPEG_INTERNALS
-#include "jconfigint.h"
 #include "../../jinclude.h"
 #include "../../jpeglib.h"
 #include "../../jsimd.h"
diff --git a/simd/arm/jdcolor-neon.c b/simd/arm/jdcolor-neon.c
index ea4668f1..28dbc572 100644
--- a/simd/arm/jdcolor-neon.c
+++ b/simd/arm/jdcolor-neon.c
@@ -21,7 +21,6 @@
  */
 
 #define JPEG_INTERNALS
-#include "jconfigint.h"
 #include "../../jinclude.h"
 #include "../../jpeglib.h"
 #include "../../jsimd.h"
diff --git a/simd/arm/jdmerge-neon.c b/simd/arm/jdmerge-neon.c
index e4f91fdc..18fb9d8a 100644
--- a/simd/arm/jdmerge-neon.c
+++ b/simd/arm/jdmerge-neon.c
@@ -21,7 +21,6 @@
  */
 
 #define JPEG_INTERNALS
-#include "jconfigint.h"
 #include "../../jinclude.h"
 #include "../../jpeglib.h"
 #include "../../jsimd.h"
diff --git a/simd/arm/jidctint-neon.c b/simd/arm/jidctint-neon.c
index 043b652e..d25112ef 100644
--- a/simd/arm/jidctint-neon.c
+++ b/simd/arm/jidctint-neon.c
@@ -22,7 +22,6 @@
  */
 
 #define JPEG_INTERNALS
-#include "jconfigint.h"
 #include "../../jinclude.h"
 #include "../../jpeglib.h"
 #include "../../jsimd.h"
diff --git a/simd/i386/jsimd.c b/simd/i386/jsimd.c
index e57c1e56..3bfd0946 100644
--- a/simd/i386/jsimd.c
+++ b/simd/i386/jsimd.c
@@ -21,7 +21,6 @@
 #include "../../jdct.h"
 #include "../../jsimddct.h"
 #include "../jsimd.h"
-#include "jconfigint.h"
 
 /*
  * In the PIC cases, we have no guarantee that constants will keep
diff --git a/simd/x86_64/jsimd.c b/simd/x86_64/jsimd.c
index 9058f61d..36655d25 100644
--- a/simd/x86_64/jsimd.c
+++ b/simd/x86_64/jsimd.c
@@ -21,7 +21,6 @@
 #include "../../jdct.h"
 #include "../../jsimddct.h"
 #include "../jsimd.h"
-#include "jconfigint.h"
 
 /*
  * In the PIC cases, we have no guarantee that constants will keep
diff --git a/turbojpeg.c b/turbojpeg.c
index a1544f24..5293a895 100644
--- a/turbojpeg.c
+++ b/turbojpeg.c
@@ -42,7 +42,6 @@
 #include "transupp.h"
 #include "./jpegcomp.h"
 #include "./cdjpeg.h"
-#include "jconfigint.h"
 
 extern void jpeg_mem_dest_tj(j_compress_ptr, unsigned char **, unsigned long *,
                              boolean);