9a24fbe474
There's a conflict between basetsd.h (w32api) and jmorecfg.h Both contain a definition for the data type INT32, but they're different from each other (signed int vs. long). Added a patch which makes the library use the data type signed int for INT32
17 lines
540 B
Diff
17 lines
540 B
Diff
--- win/jconfig.h.in.orig 2011-06-03 20:17:01.918582804 +0200
|
|
+++ win/jconfig.h.in 2011-06-03 20:19:23.622100937 +0200
|
|
@@ -25,7 +25,14 @@
|
|
#endif
|
|
#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
|
|
|
|
+/* Define "INT32" as int, not long, per Windows custom */
|
|
+#ifndef _BASETSD_H_ /* don't conflict if basetsd.h already read */
|
|
+typedef short INT16;
|
|
+typedef signed int INT32;
|
|
+#endif
|
|
+#define XMD_H /* prevent jmorecfg.h from redefining it */
|
|
+
|
|
#define inline __inline
|
|
|
|
#ifdef JPEG_INTERNALS
|