[pkgsrc/trunk]: pkgsrc/www/firefox Only include <stdbool.h> if !defined(_cplu...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9cf9e37343b2
branches:  trunk
changeset: 482158:9cf9e37343b2
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Thu Oct 21 00:55:36 2004 +0000

description:
Only include <stdbool.h> if !defined(_cplusplus) in nptypes.h.

Fixes build on NetBSD/macppc and maybe others, tested by Peter Bex
on 2-0/macppc and i386/-current/2-0 by me, closes PR pkg/27033.

diffstat:

 www/firefox/distinfo         |   3 ++-
 www/firefox/patches/patch-cd |  29 +++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletions(-)

diffs (47 lines):

diff -r e870b23af4ba -r 9cf9e37343b2 www/firefox/distinfo
--- a/www/firefox/distinfo      Thu Oct 21 00:19:30 2004 +0000
+++ b/www/firefox/distinfo      Thu Oct 21 00:55:36 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2004/10/04 09:15:29 grant Exp $
+$NetBSD: distinfo,v 1.19 2004/10/21 00:55:36 xtraeme Exp $
 
 SHA1 (firefox-0.10.1/firefox-1.0PR-source.tar.bz2) = e12f861c8e55fe591053f30e9c9259fa8e662c41
 Size (firefox-0.10.1/firefox-1.0PR-source.tar.bz2) = 32380173 bytes
@@ -35,3 +35,4 @@
 SHA1 (patch-ca) = 479ef14631ae019ae5ca1c08a2f786294f3e972b
 SHA1 (patch-cb) = fd0f033d63be066ce5c47057d72c48a085718908
 SHA1 (patch-cc) = cb08d4b7330c9e471d172c11772c840e613ceb76
+SHA1 (patch-cd) = bbe839bce72a1d6816fa0c091172a818fb469981
diff -r e870b23af4ba -r 9cf9e37343b2 www/firefox/patches/patch-cd
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-cd      Thu Oct 21 00:55:36 2004 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-cd,v 1.1 2004/10/21 00:55:36 xtraeme Exp $
+
+--- modules/plugin/base/public/nptypes.h.orig  2004-10-21 01:07:27.000000000 +0200
++++ modules/plugin/base/public/nptypes.h       2004-10-21 01:09:38.000000000 +0200
+@@ -78,8 +78,10 @@
+     typedef int bool;
+   #endif
+   #else /* OPENBSD is defined, so use its bool */
++  #if !defined(__cplusplus)
+     #include <stdbool.h>
+   #endif
++  #endif
+   #else
+   /*
+    * FreeBSD defines uint32_t and bool.
+@@ -97,6 +99,7 @@
+    */
+   #include <stdint.h>
+ 
++  #if !defined(__cplusplus)
+   #if !defined(__GNUC__) || (__GNUC__ > 2 || __GNUC_MINOR__ > 95)
+     #include <stdbool.h>
+   #else
+@@ -106,4 +109,5 @@
+      */
+     #define bool int
+   #endif
++  #endif
+ #endif