rpms
/
mingw-libjpeg-turbo
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '631b5fa4dd'
${ noResults }
mingw-libjpeg-turbo/libjpeg-turbo-dont-conflict...

17 lines
561 B
Raw Normal View History Unescape

Fix a conflict between w32api's basetsd.h and jmorecfg.h 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
14 years ago
--- 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 */
Updated the INT32 patch so that both the mingw.org and the mingw-w64 toolchains are supported
14 years ago
+#if !(defined(_BASETSD_H_) || defined(_BASETSD_H)) /* don't conflict if basetsd.h already read */
Fix a conflict between w32api's basetsd.h and jmorecfg.h 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
14 years ago
+typedef short INT16;
+typedef signed int INT32;
+#endif
+#define XMD_H /* prevent jmorecfg.h from redefining it */
+
#define inline __inline
#ifdef JPEG_INTERNALS