rpms/mingw-libjpeg-turbo
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated the INT32 patch so that both the mingw.org and the mingw-w64 toolchains are supported

Browse Source
This commit is contained in:
Erik van Pienbroek 2011-06-03 21:29:06 +02:00
parent 9a24fbe474
commit b28de45720
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libjpeg-turbo-dont-conflict-with-basetsd-h.diff
View File

@ -5,7 +5,7 @@
#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ #define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
+/* Define "INT32" as int, not long, per Windows custom */ +/* Define "INT32" as int, not long, per Windows custom */
+#ifndef _BASETSD_H_ /* don't conflict if basetsd.h already read */ +#if !(defined(_BASETSD_H_) || defined(_BASETSD_H)) /* don't conflict if basetsd.h already read */
+typedef short INT16; +typedef short INT16;
+typedef signed int INT32; +typedef signed int INT32;
+#endif +#endif

6
mingw-libjpeg-turbo.spec
View File

@ -8,7 +8,7 @@
Name: mingw-libjpeg-turbo Name: mingw-libjpeg-turbo
Version: 1.1.1 Version: 1.1.1
Release: 4%{?dist} Release: 5%{?dist}
Summary: MinGW Windows Libjpeg-turbo library Summary: MinGW Windows Libjpeg-turbo library
License: wxWidgets License: wxWidgets
@ -108,6 +108,10 @@ chmod -x README-turbo.txt
%changelog %changelog
* Fri Jun 3 2011 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.1.1-5
- Updated the INT32 patch so that both the mingw.org and the mingw-w64
toolchains are supported
* Fri Jun 3 2011 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.1.1-4 * Fri Jun 3 2011 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.1.1-4
- Fix a conflict between w32api's basetsd.h and jmorecfg.h (conflicting - Fix a conflict between w32api's basetsd.h and jmorecfg.h (conflicting
declarations for INT32) declarations for INT32)