diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 21:06:47 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 21:06:47 +0200 |
| commit | 42e4ae042a4c86e58bcb8b6d2d59ba4a988285b4 (patch) | |
| tree | a7f25b1d335a834a7c3ae104cee913ef3a4dd4fb /src/3rdparty/libjpeg/src/jmorecfg.h | |
| parent | 4ee4fc18b4067b90efa46ca9baba74f53b54d9ec (diff) | |
| parent | 168ff3419f256fdb35b586275d293fc0cd773fe1 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl
Change-Id: Iaff6b55275e50d19973e1020853d8622587069f9
Diffstat (limited to 'src/3rdparty/libjpeg/src/jmorecfg.h')
| -rw-r--r-- | src/3rdparty/libjpeg/src/jmorecfg.h | 4 |
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. */ |