Added a patch that prevents declarations if the identifier is already a

macro.

2 files changed, 21 insertions, 1 deletions

diff --git a/cad/boolean/distinfo b/cad/boolean/distinfo
index 34171ffb874..92ddbbbb421 100644
--- a/cad/boolean/distinfo
+++ b/cad/boolean/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/08/18 23:52:14 dmcmahill Exp $
+$NetBSD: distinfo,v 1.6 2005/12/18 21:08:55 rillig Exp $
 
 SHA1 (boolean-6.7/boolean_6_7.zip) = c0d5dd7963e2f02be1ebe97eeddfb6a7377feaa3
 RMD160 (boolean-6.7/boolean_6_7.zip) = 5a1a926dd130312ea8255576993b92f826b2e30d
 Size (boolean-6.7/boolean_6_7.zip) = 3841104 bytes
 SHA1 (patch-aa) = d2287a7271b7aa0a50b1ef9d87bf5e5ba8a6db6e
 SHA1 (patch-ab) = 79e7c998362f0ab6e766207e376b5ff53abd2cab
+SHA1 (patch-ac) = d76d86f827b745d2cb66c295fcf77eb8e99f7ba1
diff --git a/cad/boolean/patches/patch-ac b/cad/boolean/patches/patch-ac
new file mode 100644
index 00000000000..d84ce2dac50
--- /dev/null
+++ b/cad/boolean/patches/patch-ac
@@ -0,0 +1,19 @@
+$NetBSD: patch-ac,v 1.3 2005/12/18 21:08:55 rillig Exp $
+
+Don't define identifiers that are already macros.
+
+--- modules/kbool/include/booleng.h.orig	Mon Jul 18 21:56:16 2005
++++ modules/kbool/include/booleng.h	Sun Dec 18 20:56:07 2005
+@@ -56,8 +56,12 @@ class KBoolLink;

+ typedef long long B_INT;		   // 8 bytes integer

+ //#define MAXB_INT LONG_LONG_MAX

+ //#define MINB_INT LONG_LONG_MIN	// 8 bytes integer

++#ifndef MAXB_INT
+ const B_INT MAXB_INT = (0x7fffffffffffffffLL);             // 8 bytes integer

++#endif
++#ifndef MINB_INT
+ const B_INT MINB_INT = (0x8000000000000000LL);

++#endif
+ 

+ #else //defined(__UNIX__) || defined(__GNUG__)

+