summaryrefslogtreecommitdiff
path: root/src/3rdparty/libjpeg/src/jmorecfg.h
diff options
context:
space:
mode:
authorEirik Aavitsland <eirik.aavitsland@qt.io>2022-03-02 10:43:34 +0100
committerEirik Aavitsland <eirik.aavitsland@qt.io>2022-03-03 13:57:33 +0000
commit9d10338d583f5c36fff196a0d9bb987638ed6487 (patch)
tree5b6f1bda198bfcd13527165540f5c2b7bea9f158 /src/3rdparty/libjpeg/src/jmorecfg.h
parentde28284547e109c0528bcb6491a0272623e010bb (diff)
downloadqtbase-9d10338d583f5c36fff196a0d9bb987638ed6487.tar.gz
Update bundled libjpeg-turbo to version 2.1.3
[ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.1.3 Change-Id: I69ebd10641b07af324f6ae056cddb65cc0b5ce82 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 03b930470365bd32f93d761bc823d456e8de6853) Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src/3rdparty/libjpeg/src/jmorecfg.h')
-rw-r--r--src/3rdparty/libjpeg/src/jmorecfg.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/3rdparty/libjpeg/src/jmorecfg.h b/src/3rdparty/libjpeg/src/jmorecfg.h
index fb3a9cf411..b33a991914 100644
--- a/src/3rdparty/libjpeg/src/jmorecfg.h
+++ b/src/3rdparty/libjpeg/src/jmorecfg.h
@@ -100,11 +100,7 @@ typedef unsigned char UINT8;
/* UINT16 must hold at least the values 0..65535. */
-#ifdef HAVE_UNSIGNED_SHORT
typedef unsigned short UINT16;
-#else /* not HAVE_UNSIGNED_SHORT */
-typedef unsigned int UINT16;
-#endif /* HAVE_UNSIGNED_SHORT */
/* INT16 must hold at least the values -32768..32767. */