Thu Jan 24 22:10:43 2013 UTC ()
Fix problem with booleans by reverting to the old definition.


(adam)
diff -r1.15 -r1.16 pkgsrc/graphics/jpeg/distinfo
diff -r0 -r1.1 pkgsrc/graphics/jpeg/patches/patch-jmorecfg.h
cvs diff -r1.15 -r1.16 pkgsrc/graphics/jpeg/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/jpeg/distinfo 2013/01/24 21:49:18 1.15
+++ pkgsrc/graphics/jpeg/distinfo 2013/01/24 22:10:42 1.16
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.15 2013/01/24 21:49:18 adam Exp $ 1$NetBSD: distinfo,v 1.16 2013/01/24 22:10:42 adam Exp $
2 2
3SHA1 (jpegsrc.v9.tar.gz) = 724987e7690ca3d74d6ab7c1f1b6854e88ca204b 3SHA1 (jpegsrc.v9.tar.gz) = 724987e7690ca3d74d6ab7c1f1b6854e88ca204b
4RMD160 (jpegsrc.v9.tar.gz) = 048e52334f6341424bd684458799d9c72254e8ec 4RMD160 (jpegsrc.v9.tar.gz) = 048e52334f6341424bd684458799d9c72254e8ec
5Size (jpegsrc.v9.tar.gz) = 987900 bytes 5Size (jpegsrc.v9.tar.gz) = 987900 bytes
6SHA1 (patch-af) = aba44e1e3520d2a232f6bd949a82c150e0b3e0f4 6SHA1 (patch-af) = aba44e1e3520d2a232f6bd949a82c150e0b3e0f4
7SHA1 (patch-ag) = 4fc698186d149f1152d30bf65a96461bc331c812 7SHA1 (patch-ag) = 4fc698186d149f1152d30bf65a96461bc331c812
 8SHA1 (patch-jmorecfg.h) = 153694c30f466222240275a7c9f525d6df60bda5
File Added: pkgsrc/graphics/jpeg/patches/patch-jmorecfg.h
$NetBSD: patch-jmorecfg.h,v 1.1 2013/01/24 22:10:43 adam Exp $

Avoid problems when FALSE and TRUE are defined as preprocessor macros.

--- jmorecfg.h.orig	2012-08-08 14:23:20.000000000 +0000
+++ jmorecfg.h
@@ -252,15 +252,14 @@ typedef void noreturn_t;
  * Defining HAVE_BOOLEAN before including jpeglib.h should make it work.
  */
 
-#ifdef HAVE_BOOLEAN
 #ifndef FALSE			/* in case these macros already exist */
 #define FALSE	0		/* values of boolean */
 #endif
 #ifndef TRUE
 #define TRUE	1
 #endif
-#else
-typedef enum { FALSE = 0, TRUE = 1 } boolean;
+#ifndef HAVE_BOOLEAN
+typedef int boolean;
 #endif