NetBSD Problem Report #49551
From www@NetBSD.org Fri Jan 9 15:54:28 2015
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [149.20.53.66])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK))
by mollari.NetBSD.org (Postfix) with ESMTPS id 9D87EA64EF
for <gnats-bugs@gnats.NetBSD.org>; Fri, 9 Jan 2015 15:54:28 +0000 (UTC)
Message-Id: <20150109155427.99C88A654D@mollari.NetBSD.org>
Date: Fri, 9 Jan 2015 15:54:27 +0000 (UTC)
From: krishnan.n@gai.co.in
Reply-To: krishnan.n@gai.co.in
To: gnats-bugs@NetBSD.org
Subject: Need to enclose HAVE_BOOLEAN in #ifndef/#endif
X-Send-Pr-Version: www-1.0
>Number: 49551
>Category: pkg
>Synopsis: Need to enclose HAVE_BOOLEAN in #ifndef/#endif
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager
>State: closed
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Fri Jan 09 15:55:00 +0000 2015
>Closed-Date: Wed Sep 04 22:37:52 +0000 2019
>Last-Modified: Wed Sep 04 22:37:52 +0000 2019
>Originator: Krishnan
>Release: www/netsurf
>Organization:
gai Technologes Pvt Ltd
>Environment:
NetBSD adharaz 6.1.5 NetBSD 6.1.5 (GENERIC) amd64
>Description:
Building netsurf broke with 'boolean' redefined error:
/usr/pkgsrc/www/netsurf/work/.buildlink/include/libmng_types.h:205:13: error: redefinition of typedef 'boolean'
/usr/pkgsrc/www/netsurf/work/.buildlink/include/jmorecfg.h:313:13: note: previous declaration of 'boolean' was here
>How-To-Repeat:
cd $PKGSRD/www/netsurf; make
>Fix:
diff --git a/usr/pkg/include/libmng_types.h b/usr/pkg/include/libmng_types.h
index 09592a5..3f4148a 100644
--- a/usr/pkg/include/libmng_types.h
+++ b/usr/pkg/include/libmng_types.h
@@ -201,9 +201,11 @@
#define JPEG_INTERNAL_OPTIONS /* for RGB_PIXELSIZE */
/* There has been a change in jpeg-9 : */
#ifndef _WIN32
-#define HAVE_BOOLEAN
+# ifndef BOOLEAN
+# define HAVE_BOOLEAN
typedef int boolean;
#endif
+#endif
#include <jpeglib.h>
#endif /* MNG_INCLUDE_IJG6B */
>Release-Note:
>Audit-Trail:
From: Krishnan N <krishnan.n@gai.co.in>
To: gnats-bugs@netbsd.org
Cc:
Subject: Re: pkg/49551: Need to enclose HAVE_BOOLEAN in #ifndef/#endif
Date: Sat, 10 Jan 2015 06:12:29 +0000
Hi,
The patch is wrong, should have been #ifndef HAVE_BOOLEAN, not
#ifndef BOOLEAN. Reattaching correct patch. Sorry about the slip-up.
diff --git a/usr/pkg/include/libmng_types.h b/usr/pkg/include/libmng_types.h
index 09592a5..8444624 100644
--- a/usr/pkg/include/libmng_types.h
+++ b/usr/pkg/include/libmng_types.h
@@ -201,9 +201,11 @@
#define JPEG_INTERNAL_OPTIONS /* for RGB_PIXELSIZE */
/* There has been a change in jpeg-9 : */
#ifndef _WIN32
-#define HAVE_BOOLEAN
+# ifndef HAVE_BOOLEAN
+# define HAVE_BOOLEAN
typedef int boolean;
#endif
+#endif
#include <jpeglib.h>
#endif /* MNG_INCLUDE_IJG6B */
Thanks,
krishnan
On Fri, Jan 9, 2015 at 3:55 PM, <gnats-admin@netbsd.org> wrote:
> Thank you very much for your problem report.
> It has the internal identification `pkg/49551'.
> The individual assigned to look at your
> report is: pkg-manager.
>
>>Category: pkg
>>Responsible: pkg-manager
>>Synopsis: Need to enclose HAVE_BOOLEAN in #ifndef/#endif
>>Arrival-Date: Fri Jan 09 15:55:00 +0000 2015
>
State-Changed-From-To: open->closed
State-Changed-By: maya@NetBSD.org
State-Changed-When: Wed, 04 Sep 2019 22:37:52 +0000
State-Changed-Why:
upstream mng seemed to apply this change. thanks for the report and sorry it was not addressed at the time.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.43 2018/01/16 07:36:43 maya Exp $
$NetBSD: gnats_config.sh,v 1.9 2014/08/02 14:16:04 spz Exp $
Copyright © 1994-2017
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.