File jpeg-7-typedefs.patch of Package mingw32-jpeg

Overview Repositories Revisions Requests Users Attributes Meta

File jpeg-7-typedefs.patch of Package mingw32-jpeg (Revision 4c44ab508f07cd6b1f86a93352061ff7)

Currently displaying revision 4c44ab508f07cd6b1f86a93352061ff7 , Show latest

--- jpeg-6b/jconfig.cfg	1994-12-06 17:43:15.000000000 +0100
+++ jpeg-6b/jconfig.cfg	2009-04-24 07:45:05.000000000 +0200
@@ -26,6 +26,12 @@
 
 #endif /* JPEG_INTERNALS */
 
+/* Define "boolean" as unsigned char, not int, per Windows custom */
+#ifndef __RPCNDR_H__ 	/* don't conflict if rpcndr.h already read */
+typedef unsigned char boolean;
+#endif
+#define HAVE_BOOLEAN	/* prevent jmorecfg.h from redefining it */
+
 #ifdef JPEG_CJPEG_DJPEG
 
 #define BMP_SUPPORTED		/* BMP image file format */
--- jpeg-6b/jmorecfg.h	1997-08-10 01:58:56.000000000 +0200
+++ jpeg-6b/jmorecfg.h	2009-01-21 22:17:20.000000000 +0100
@@ -161,7 +161,7 @@
 #ifndef XMD_H			/* X11/xmd.h correctly defines INT32 */
 #ifndef _BASETSD_H_		/* Microsoft defines it in basetsd.h */
 #ifndef QGLOBAL_H		/* Qt defines it in qglobal.h */
-typedef long INT32;
+typedef int INT32;
 #endif
 #endif
 #endif
@@ -229,8 +229,14 @@
  * specific header files that you want to include together with these files.
  * Defining HAVE_BOOLEAN before including jpeglib.h should make it work.
  */
-
-#ifndef HAVE_BOOLEAN
+ 
+#ifdef _WIN32
+#ifndef __RPCNDR_H__
+typedef unsigned char boolean;
+#endif
+#define HAVE_BOOLEAN
+#endif
+#if !defined(HAVE_BOOLEAN) && !defined(__RPCNDR_H__)
 typedef int boolean;
 #endif
 #ifndef FALSE			/* in case these macros already exist */

Places

File jpeg-7-typedefs.patch of Package mingw32-jpeg (Revision 4c44ab508f07cd6b1f86a93352061ff7)

Places