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

@@ -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

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 <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
 - Fix a conflict between w32api's basetsd.h and jmorecfg.h (conflicting
   declarations for INT32)