bump product version to 4.2.0.1
[LibreOffice.git] / external / jpeg / patches / jpeg-8c-jmorecfg.patch
blob34437440220ffeb9d96e0d616b487282f51f1605
1 --- misc/jpeg-8c/jmorecfg.h 2009-11-20 09:01:24.000000000 +0100
2 +++ misc/build/jpeg-8c/jmorecfg.h 2011-03-24 21:29:02.073761750 +0100
3 @@ -21,7 +21,7 @@
4 * We do not support run-time selection of data precision, sorry.
5 */
7 -#define BITS_IN_JSAMPLE 8 /* use 8 or 12 */
8 +#define BITS_IN_JSAMPLE 8 /* use 8 or 12 */
12 @@ -158,7 +158,8 @@
14 /* INT32 must hold at least signed 32-bit values. */
16 -#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */
17 +#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */
18 +#ifndef _SOLAR_H
19 #ifndef _BASETSD_H_ /* Microsoft defines it in basetsd.h */
20 #ifndef _BASETSD_H /* MinGW is slightly different */
21 #ifndef QGLOBAL_H /* Qt defines it in qglobal.h */
22 @@ -166,6 +167,7 @@
23 #endif
24 #endif
25 #endif
26 +#endif
27 #endif
29 /* Datatype used for image dimensions. The JPEG standard only supports