jpeg 9: jconfig.h: fix issue with type boolean on Haiku

This commit is contained in:
Ingo Weinhold
2013-06-14 00:01:10 +02:00
parent a5a6c048db
commit ad01af5eae
2 changed files with 30 additions and 1 deletions

View File

@@ -13,9 +13,11 @@ LICENSE="JPEG"
COPYRIGHT="1991-2013, Thomas G. Lane, Guido Vollbeding. All Rights Reserved"
SRC_URI="http://www.ijg.org/files/jpegsrc.v9.tar.gz"
CHECKSUM_MD5="b397211ddfd506b92cd5e02a22ac924d"
REVISION="1"
REVISION="2"
ARCHITECTURES="x86_gcc2 ?x86"
PATCHES="jpeg-9.patchset"
PROVIDES="
jpeg = $portVersion compat >= 9
lib:libjpeg = $portVersion compat >= 9

View File

@@ -0,0 +1,27 @@
From b176455d2abc3a95f7e9133c8f4e18ba6f8678b5 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Thu, 13 Jun 2013 23:56:48 +0200
Subject: jconfig.cfg: fix handling of "boolean" on Haiku
diff --git a/jconfig.cfg b/jconfig.cfg
index bb7435c..69a1c31 100644
--- a/jconfig.cfg
+++ b/jconfig.cfg
@@ -25,6 +25,13 @@ typedef unsigned char boolean;
#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
#endif
+/* On Haiku <SupportDefs.h> defines macros TRUE and FALSE, but not the type
+ boolean. */
+#ifdef __HAIKU__
+typedef int boolean;
+#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
+#endif
+
#ifdef JPEG_INTERNALS
#undef RIGHT_SHIFT_IS_UNSIGNED
--
1.7.5