From a73d029afe6c4df668c2dc620c9a9184e8081e90 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 2 Nov 2020 13:47:45 +0100 Subject: [PATCH 05/12] Fix libjpeg workaround for conflict with rpcndr.h Otherwise it won't compile against mingw-w64-libjpeg-turbo. This version of libjpeg seems to take care of the conflict already as long as jconfig.h is included before jmorecfg.h. Change-Id: I011b7735485689c9797cffe2646c8c3d15d0645e --- src/plugins/imageformats/jpeg/qjpeghandler.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp index 6d88438c47..a16dae28b1 100644 --- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp +++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp @@ -62,6 +62,7 @@ // including jpeglib.h seems to be a little messy extern "C" { #define XMD_H // shut JPEGlib up +#include // ensure jconfig.h is included before jmorecfg.h #include #ifdef const # undef const // remove crazy C hackery in jconfig.h -- 2.36.1