Subject: Re: More fallout (Was: Build failure - libexec/ld.elf_so)
To: None <current-users@netbsd.org>
From: Geoff Wing <gcw@pobox.com>
List: current-users
Date: 08/17/2007 13:16:08
On Friday 2007-08-17 12:35 +1000, Geoff Wing output:
:Following other patches are needed.
:The include/rpcsvc/yp_prot.h could be savaged some more if needed
:
:pppd and wpa patches aren't here and need changes in the dist dir.

Here are hackish versions of them.

Regards,
Geoff

------------------------------------------------------------

--- dist/pppd/pppd/pppd.h.org	2006-11-06 10:13:41.000000000 +1100
+++ dist/pppd/pppd/pppd.h	2007-08-17 13:12:29.000000000 +1000
@@ -52,6 +52,7 @@
 #define __PPPD_H__
 
 #include <stdio.h>		/* for FILE */
+#include <stdbool.h>		/* for bool */
 #include <limits.h>		/* for NGROUPS_MAX */
 #include <sys/param.h>		/* for MAXPATHLEN and BSD4_4, if defined */
 #include <sys/types.h>		/* for u_int32_t, if defined */
@@ -87,8 +88,6 @@
  * Option descriptor structure.
  */
 
-typedef unsigned char	bool;
-
 enum opt_type {
 	o_special_noarg = 0,
 	o_special = 1,

------------------------------------------------------------

--- dist/hostapd/ieee802_1x.c.org	2006-05-26 09:15:44.000000000 +1000
+++ dist/hostapd/ieee802_1x.c	2007-08-17 13:13:03.000000000 +1000
@@ -1634,9 +1634,9 @@
 }
 
 
-static const char * bool_txt(Boolean bool)
+static const char * bool_txt(Boolean bbool)
 {
-	return bool ? "TRUE" : "FALSE";
+	return bbool ? "TRUE" : "FALSE";
 }