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.
nvdla · Feb 6, 2016 · ce0dd94 · ce0dd94
1 parent 8ff67fd
commit ce0dd94
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -5,7 +5,7 @@
  * Copyright (C) 1994-1997, Thomas G. Lane.
  * libjpeg-turbo Modifications:
  * Copyright 2009 Pierre Ossman <[email protected]> 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
@@ -10,7 +10,6 @@
  */
 
 #define JPEG_INTERNALS
-#include "jinclude.h"
 #include "jpeglib.h"
 
 

diff --git 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
@@ -8,7 +8,6 @@
  */
 
 #define JPEG_INTERNALS
-#include "jinclude.h"
 #include "jpeglib.h"
 #include "jpegcomp.h"
 

diff --git a/jdsample.c b/jdsample.c
@@ -5,7 +5,7 @@
  * Copyright (C) 1991-1996, Thomas G. Lane.
  * libjpeg-turbo Modifications:
  * Copyright 2009 Pierre Ossman <[email protected]> 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
@@ -8,7 +8,6 @@
  */
 
 #define JPEG_INTERNALS
-#include "jinclude.h"
 #include "jpeglib.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,6 @@ @@
      */
     #define JPEG_INTERNALS
-    #include "jinclude.h"
     #include "jpeglib.h"
@@ Expand Down @@