Added three patches that prevent SWI Prolog from defining "bool" as a

struct tag, since this conflicts with <stdbool.h>. Needed on
at least NetBSD-4.99.30.

4 files changed, 72 insertions, 1 deletions

diff --git a/lang/swi-prolog-lite/distinfo b/lang/swi-prolog-lite/distinfo
index 3e6ab402d19..3fba04826ce 100644
--- a/lang/swi-prolog-lite/distinfo
+++ b/lang/swi-prolog-lite/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2006/10/12 14:14:13 joerg Exp $
+$NetBSD: distinfo,v 1.7 2007/10/13 07:54:31 rillig Exp $
 
 SHA1 (swi-prolog/pl-5.6.17.tar.gz) = e46e98b3ec8a69de3dc2eb147a9df9cbd1a17399
 RMD160 (swi-prolog/pl-5.6.17.tar.gz) = 7f6786013b43c2e00b8e4a3799cbad1f7cac2fab
@@ -14,3 +14,6 @@ SHA1 (patch-ah) = 3bfc13a920e0f3a79e6764a9ace89032989e2c67
 SHA1 (patch-ai) = 9446bc38a0a7e02de303e68c923249b615c91833
 SHA1 (patch-aj) = 4450848127eab9f05113aaabfa48725336353e79
 SHA1 (patch-ak) = e767d69287f5b649048a5a6081061522c06edc18
+SHA1 (patch-al) = 14d6309b71c0cc1f67967f2692db6ca075384def
+SHA1 (patch-am) = 008c1ae8324522b185a7bf1dd07c7446dfcf2f31
+SHA1 (patch-an) = 606f076c41c3020b5c7d0730317d709220c05d4b
diff --git a/lang/swi-prolog-lite/patches/patch-al b/lang/swi-prolog-lite/patches/patch-al
new file mode 100644
index 00000000000..b342bd81c53
--- /dev/null
+++ b/lang/swi-prolog-lite/patches/patch-al
@@ -0,0 +1,27 @@
+$NetBSD: patch-al,v 1.1 2007/10/13 07:54:31 rillig Exp $
+
+Since C99, the probability that some system header defines the type
+"bool" has risen.
+
+--- packages/xpce/src/h/kernel.h.orig	2007-10-13 09:41:23.000000000 +0200
++++ packages/xpce/src/h/kernel.h	2007-10-13 09:42:10.000000000 +0200
+@@ -1272,7 +1272,7 @@ NewClass(constant)			/* @nil, @default *
+   ABSTRACT_CONSTANT
+ End;
+ 
+-NewClass(bool)				/* @on, @off */
++NewClass(swi_bool)			/* @on, @off */
+   ABSTRACT_CONSTANT
+ End;
+ 
+@@ -1596,8 +1596,8 @@ GLOBAL int	XPCE_mt;		/* we are multi-thr
+ GLOBAL struct constant ConstantNil;	/* MUST be first! */
+ GLOBAL struct constant ConstantDefault;
+ GLOBAL struct constant ConstantClassDefault;
+-GLOBAL struct bool     BoolOn;
+-GLOBAL struct bool     BoolOff;
++GLOBAL struct swi_bool BoolOn;
++GLOBAL struct swi_bool BoolOff;
+ 
+ GLOBAL Var	RECEIVER;		/* @receiver */
+ GLOBAL Var	RECEIVER_CLASS;		/* @receiver_class */
diff --git a/lang/swi-prolog-lite/patches/patch-am b/lang/swi-prolog-lite/patches/patch-am
new file mode 100644
index 00000000000..c49b6c8d874
--- /dev/null
+++ b/lang/swi-prolog-lite/patches/patch-am
@@ -0,0 +1,15 @@
+$NetBSD: patch-am,v 1.1 2007/10/13 07:54:31 rillig Exp $
+
+See patch-al.
+
+--- packages/xpce/src/h/types.h.orig	2006-04-05 09:29:15.000000000 +0200
++++ packages/xpce/src/h/types.h	2007-10-13 09:41:46.000000000 +0200
+@@ -63,7 +63,7 @@ typedef struct binary_condition *	Binary
+ typedef struct binding *		Binding;
+ typedef struct assignment *		Assignment;
+ typedef struct block *			Block;
+-typedef struct bool *			Bool;
++typedef struct swi_bool *		Bool;
+ typedef struct c_pointer *		CPointer;
+ typedef struct cell *			Cell;
+ typedef struct chain *			Chain;
diff --git a/lang/swi-prolog-lite/patches/patch-an b/lang/swi-prolog-lite/patches/patch-an
new file mode 100644
index 00000000000..363643b8635
--- /dev/null
+++ b/lang/swi-prolog-lite/patches/patch-an
@@ -0,0 +1,26 @@
+$NetBSD: patch-an,v 1.1 2007/10/13 07:54:31 rillig Exp $
+
+See patch-al.
+
+--- packages/xpce/src/ker/self.c.orig	2005-11-21 20:45:53.000000000 +0100
++++ packages/xpce/src/ker/self.c	2007-10-13 09:42:56.000000000 +0200
+@@ -1133,7 +1133,7 @@ getVersionPce(Pce pce, Name how)
+     int n;
+ 
+     for(n=0; n<3; n++)
+-    { while(*q && isdigit(*q))
++    { while(*q && isdigit((unsigned char)*q))
+ 	q++;
+       if ( *q == '.' )
+ 	q++;
+@@ -1478,8 +1478,8 @@ pceInitialise(int handles, const char *h
+   allocRange(&ConstantNil,          sizeof(struct constant));
+   allocRange(&ConstantDefault,      sizeof(struct constant));
+   allocRange(&ConstantClassDefault, sizeof(struct constant));
+-  allocRange(&BoolOff,              sizeof(struct bool));
+-  allocRange(&BoolOn,               sizeof(struct bool));
++  allocRange(&BoolOff,              sizeof(struct swi_bool));
++  allocRange(&BoolOn,               sizeof(struct swi_bool));
+   initNamesPass1();
+   DEBUG_BOOT(Cprintf("Types ...\n"));
+   initTypes();