From 4341f6763b8a737ebc07bb78ead22bc05a1a515b Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 18 May 2021 08:43:52 +0200 Subject: Cherry-pick upstream patch for non-gcc/clang/msvc compilers Fix build w/ non-GCC-compatible Un*x/Arm compilers Fixes: QTBUG-93779 Pick-to: dev 6.1 6.0 5.15 5.12 Change-Id: Ib52e9ded6e2814c7998d6cd798e945da0f87f7a1 Reviewed-by: Eirik Aavitsland --- src/3rdparty/libjpeg/src/jchuff.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/3rdparty/libjpeg/src/jchuff.c') diff --git a/src/3rdparty/libjpeg/src/jchuff.c b/src/3rdparty/libjpeg/src/jchuff.c index 2bce767ebd..8ff817b151 100644 --- a/src/3rdparty/libjpeg/src/jchuff.c +++ b/src/3rdparty/libjpeg/src/jchuff.c @@ -44,8 +44,9 @@ * flags (this defines __thumb__). */ -#if defined(__arm__) || defined(__aarch64__) || defined(_M_ARM) || \ - defined(_M_ARM64) +/* NOTE: Both GCC and Clang define __GNUC__ */ +#if (defined(__GNUC__) && (defined(__arm__) || defined(__aarch64__))) || \ + defined(_M_ARM) || defined(_M_ARM64) #if !defined(__thumb__) || defined(__thumb2__) #define USE_CLZ_INTRINSIC #endif -- cgit v1.2.3