Fix MinGW build

jinclude.h can't be safely included multiple times, so instead of
including it in the shared (broken-out) headers, it should instead be
included by the source files that include one or more of those headers.

diff --git a/jdapistd.c b/jdapistd.c
index d134242b0861f2b8936a030c1c988dd643431287..2d00b199966cb39470ad5292357673818acde8a7 100644 (file)
--- a/jdapistd.c
+++ b/jdapistd.c
@@ -4,7 +4,7 @@
  * This file was part of the Independent JPEG Group's software:
  * Copyright (C) 1994-1996, Thomas G. Lane.
  * libjpeg-turbo Modifications:
- * Copyright (C) 2010, 2015, D. R. Commander.
+ * Copyright (C) 2010, 2015-2016, D. R. Commander.
  * Copyright (C) 2015, Google, Inc.
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
@@ -18,6 +18,7 @@
  * whole decompression library into a transcoder.
  */
 
+#include "jinclude.h"
 #include "jdmainct.h"
 #include "jdcoefct.h"
 #include "jdsample.h"

diff --git a/jdcoefct.c b/jdcoefct.c
index baf6bc8c35972ac01177c4a3ba1af404d15149a5..c51e3ffaa0dc7d9d68a0d49e5962b59365dd9993 100644 (file)
--- a/jdcoefct.c
+++ b/jdcoefct.c
@@ -5,7 +5,7 @@
  * Copyright (C) 1994-1997, Thomas G. Lane.
  * libjpeg-turbo Modifications:
  * Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
- * Copyright (C) 2010, 2015, D. R. Commander.
+ * Copyright (C) 2010, 2015-2016, D. R. Commander.
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
  *
@@ -18,6 +18,7 @@
  * Also, the input side (only) is used when reading a file for transcoding.
  */
 
+#include "jinclude.h"
 #include "jdcoefct.h"
 #include "jpegcomp.h"
 

diff --git a/jdcoefct.h b/jdcoefct.h
index 55b877a0689ea6c0a391788733f4c993f3388c17..28e7a2d974e6fcf1c44f784eb65d83f3e8c8defc 100644 (file)
--- a/jdcoefct.h
+++ b/jdcoefct.h
@@ -10,7 +10,6 @@
  */
 
 #define JPEG_INTERNALS
-#include "jinclude.h"
 #include "jpeglib.h"
 
 

diff --git a/jdmainct.c b/jdmainct.c
index d656b683cc5edc3b3598fa8da1ae4340f173d5a1..ebb069b0f4162e8e55e405ca0715017fed2dd8b2 100644 (file)
--- a/jdmainct.c
+++ b/jdmainct.c
@@ -4,7 +4,7 @@
  * This file was part of the Independent JPEG Group's software:
  * Copyright (C) 1994-1996, Thomas G. Lane.
  * libjpeg-turbo Modifications:
- * Copyright (C) 2010, D. R. Commander.
+ * Copyright (C) 2010, 2016, D. R. Commander.
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
  *
@@ -16,6 +16,7 @@
  * supplies the equivalent of the main buffer in that case.
  */
 
+#include "jinclude.h"
 #include "jdmainct.h"
 
 

diff --git a/jdmainct.h b/jdmainct.h
index 3e23aa8302b51a64b51cbbe7cd0ac71ada0133fc..c7de6195661181311e24c67700b801f305917c9f 100644 (file)
--- a/jdmainct.h
+++ b/jdmainct.h
@@ -8,7 +8,6 @@
  */
 
 #define JPEG_INTERNALS
-#include "jinclude.h"
 #include "jpeglib.h"
 #include "jpegcomp.h"
 

diff --git a/jdsample.c b/jdsample.c
index 276feae292f2845527ba1b9535ae613eba48e2e9..c9c815a580404d4a38f14c78450aac5379cf6fe9 100644 (file)
--- a/jdsample.c
+++ b/jdsample.c
@@ -5,7 +5,7 @@
  * Copyright (C) 1991-1996, Thomas G. Lane.
  * libjpeg-turbo Modifications:
  * Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
- * Copyright (C) 2010, 2015, D. R. Commander.
+ * Copyright (C) 2010, 2015-2016, D. R. Commander.
  * Copyright (C) 2014, MIPS Technologies, Inc., California
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
@@ -23,6 +23,7 @@
  *   Pub. by IEEE Computer Society Press, Los Alamitos, CA. ISBN 0-8186-8944-7.
  */
 
+#include "jinclude.h"
 #include "jdsample.h"
 #include "jsimd.h"
 #include "jpegcomp.h"

diff --git a/jdsample.h b/jdsample.h
index da905a62b21eb2d33969f2f8b031d490b3576c36..630d07e42f3c3d8352599dcdfcab96ddf7449163 100644 (file)
--- a/jdsample.h
+++ b/jdsample.h
@@ -8,7 +8,6 @@
  */
 
 #define JPEG_INTERNALS
-#include "jinclude.h"
 #include "jpeglib.h"