From 56dbe819cab194785088547a37c63d31581ab466 Mon Sep 17 00:00:00 2001 From: he Date: Tue, 7 Mar 2006 18:18:06 +0000 Subject: [PATCH] If compiling for NetBSD/vax, define boolean_t here before including with _KERNEL defined. Also add a 3-line XXX comment explaining some of why this is done. Should fix the build problem documented in PR#32907. Will be documented in doc/HACKS shortly. Fix discussed with thorpej. --- dist/ipf/ipsend/iptests.c | 10 +++++++++- dist/ipf/ipsend/sock.c | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dist/ipf/ipsend/iptests.c b/dist/ipf/ipsend/iptests.c index de7e5b68057c..89ec5f31c022 100644 --- a/dist/ipf/ipsend/iptests.c +++ b/dist/ipf/ipsend/iptests.c @@ -1,4 +1,4 @@ -/* $NetBSD: iptests.c,v 1.7 2004/07/23 05:39:03 martti Exp $ */ +/* $NetBSD: iptests.c,v 1.8 2006/03/07 18:18:06 he Exp $ */ /* * Copyright (C) 1993-1998 by Darren Reed. @@ -12,6 +12,14 @@ static const char rcsid[] = "@(#)Id: iptests.c,v 2.8.2.3 2004/04/16 23:33:04 dar #endif #include #include +#if defined(__NetBSD__) && defined(__vax__) +/* + * XXX need to declare boolean_t for _KERNEL + * which ends up including for vax. See PR#32907 + * for further details. + */ +typedef int boolean_t; +#endif #include #if !defined(__osf__) # define _KERNEL diff --git a/dist/ipf/ipsend/sock.c b/dist/ipf/ipsend/sock.c index 6ddf5b9be9b8..317d1c9a3b89 100644 --- a/dist/ipf/ipsend/sock.c +++ b/dist/ipf/ipsend/sock.c @@ -1,4 +1,4 @@ -/* $NetBSD: sock.c,v 1.6 2004/03/28 09:00:56 martti Exp $ */ +/* $NetBSD: sock.c,v 1.7 2006/03/07 18:18:06 he Exp $ */ /* * sock.c (C) 1995-1998 Darren Reed @@ -14,6 +14,14 @@ static const char rcsid[] = "@(#)Id: sock.c,v 2.8.4.1 2004/03/23 12:58:06 darren #include #include #include +#if defined(__NetBSD__) && defined(__vax__) +/* + * XXX need to declare boolean_t for _KERNEL + * which ends up including for vax. See PR#32907 + * for further details. + */ +typedef int boolean_t; +#endif #ifndef ultrix #include #endif