From b28de457201e3d5dda66bb49cab2a228d6d787b9 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Fri, 3 Jun 2011 21:29:06 +0200 Subject: [PATCH] Updated the INT32 patch so that both the mingw.org and the mingw-w64 toolchains are supported --- libjpeg-turbo-dont-conflict-with-basetsd-h.diff | 2 +- mingw-libjpeg-turbo.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libjpeg-turbo-dont-conflict-with-basetsd-h.diff b/libjpeg-turbo-dont-conflict-with-basetsd-h.diff index 4b84f77..318dccb 100644 --- a/libjpeg-turbo-dont-conflict-with-basetsd-h.diff +++ b/libjpeg-turbo-dont-conflict-with-basetsd-h.diff @@ -5,7 +5,7 @@ #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 */ ++#if !(defined(_BASETSD_H_) || defined(_BASETSD_H)) /* don't conflict if basetsd.h already read */ +typedef short INT16; +typedef signed int INT32; +#endif diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index fa6147f..c5e7f02 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -8,7 +8,7 @@ Name: mingw-libjpeg-turbo Version: 1.1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -108,6 +108,10 @@ chmod -x README-turbo.txt %changelog +* Fri Jun 3 2011 Erik van Pienbroek - 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 - 1.1.1-4 - Fix a conflict between w32api's basetsd.h and jmorecfg.h (conflicting declarations for INT32)