ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MinGW build

Browse Source 
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.
This commit is contained in:
DRC
2016-02-06 12:18:44 -06:00
parent 8ff67fdb24
commit ce0dd949b2
7 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jdapistd.c
View File

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

3
jdcoefct.c
View File

@@ -5,7 +5,7 @@
* Copyright (C) 1994-1997, Thomas G. Lane. * Copyright (C) 1994-1997, Thomas G. Lane.
* libjpeg-turbo Modifications: * libjpeg-turbo Modifications:
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB * 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 * For conditions of distribution and use, see the accompanying README.ijg
* file. * file.
* *
@@ -18,6 +18,7 @@
* Also, the input side (only) is used when reading a file for transcoding. * Also, the input side (only) is used when reading a file for transcoding.
*/ */
#include "jinclude.h"
#include "jdcoefct.h" #include "jdcoefct.h"
#include "jpegcomp.h" #include "jpegcomp.h"

1
jdcoefct.h
View File

@@ -10,7 +10,6 @@
*/ */
#define JPEG_INTERNALS #define JPEG_INTERNALS
#include "jinclude.h"
#include "jpeglib.h" #include "jpeglib.h"

3
jdmainct.c
View File

@@ -4,7 +4,7 @@
* This file was part of the Independent JPEG Group's software: * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1994-1996, Thomas G. Lane. * Copyright (C) 1994-1996, Thomas G. Lane.
* libjpeg-turbo Modifications: * 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 * For conditions of distribution and use, see the accompanying README.ijg
* file. * file.
* *
@@ -16,6 +16,7 @@
* supplies the equivalent of the main buffer in that case. * supplies the equivalent of the main buffer in that case.
*/ */
#include "jinclude.h"
#include "jdmainct.h" #include "jdmainct.h"

1
jdmainct.h
View File

@@ -8,7 +8,6 @@
*/ */
#define JPEG_INTERNALS #define JPEG_INTERNALS
#include "jinclude.h"
#include "jpeglib.h" #include "jpeglib.h"
#include "jpegcomp.h" #include "jpegcomp.h"

3
jdsample.c
View File

@@ -5,7 +5,7 @@
* Copyright (C) 1991-1996, Thomas G. Lane. * Copyright (C) 1991-1996, Thomas G. Lane.
* libjpeg-turbo Modifications: * libjpeg-turbo Modifications:
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB * 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 * Copyright (C) 2014, MIPS Technologies, Inc., California
* For conditions of distribution and use, see the accompanying README.ijg * For conditions of distribution and use, see the accompanying README.ijg
* file. * file.
@@ -23,6 +23,7 @@
* Pub. by IEEE Computer Society Press, Los Alamitos, CA. ISBN 0-8186-8944-7. * Pub. by IEEE Computer Society Press, Los Alamitos, CA. ISBN 0-8186-8944-7.
*/ */
#include "jinclude.h"
#include "jdsample.h" #include "jdsample.h"
#include "jsimd.h" #include "jsimd.h"
#include "jpegcomp.h" #include "jpegcomp.h"

1
jdsample.h
View File

@@ -8,7 +8,6 @@
*/ */
#define JPEG_INTERNALS #define JPEG_INTERNALS
#include "jinclude.h"
#include "jpeglib.h" #include "jpeglib.h"