blob: b54267f2323e338f90f8a0bdd207612e83704dce (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
--- libjpeg-turbo-1.2.90/jmorecfg.h.orig 2013-04-04 15:08:10 +0400
+++ libjpeg-turbo-1.2.90/jmorecfg.h 2013-04-04 16:23:13 +0400
@@ -12,6 +12,12 @@
* optimizations. Most users will not need to touch this file.
*/
+/* prevents conflicts */
+#if defined(__MINGW32__)
+#include <shlwapi.h> /* typedefs INT16 and INT32 */
+
+#define HAVE_BOOLEAN
+#endif
/*
* Define BITS_IN_JSAMPLE as either
@@ -118,6 +118,7 @@
#endif /* HAVE_UNSIGNED_CHAR */
+#ifndef _BASETSD_H_ /* basestd.h from mingw-w64 defines UINT8, UINT16, INT16, INT32 */
/* These typedefs are used for various table entries and so forth.
* They must be at least as wide as specified; but making them too big
* won't cost a huge amount of memory, so we don't provide special
@@ -158,6 +158,7 @@
#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */
typedef long INT32;
#endif
+#endif
/* Datatype used for image dimensions. The JPEG standard only supports
* images up to 64K*64K due to 16-bit fields in SOF markers. Therefore
|