From be0fadb18fb36cc56c984d62127d6d78ee530c97 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 29 Jan 2002 04:59:03 +0000
Subject: [PATCH] Fix problem: don't define true and false if <stdbool.h>
 exists, because the GNU version of <stdbool.h> breaks in that case.  Instead
 just use <stdbool.h> to make the definitions.

---
 v7/src/microcode/configure.in |  6 +++---
 v7/src/microcode/confshared.h | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/v7/src/microcode/configure.in b/v7/src/microcode/configure.in
index d0814dfb7..328b51cb0 100644
--- a/v7/src/microcode/configure.in
+++ b/v7/src/microcode/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-dnl Copyright (c) 2000-2001 Massachusetts Institute of Technology
+dnl Copyright (c) 2000-2002 Massachusetts Institute of Technology
 dnl
 dnl This program is free software; you can redistribute it and/or
 dnl modify it under the terms of the GNU General Public License as
@@ -17,7 +17,7 @@ dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 dnl 02111-1307, USA.
 
-AC_REVISION([$Id: configure.in,v 11.13 2001/07/02 01:20:32 cph Exp $])
+AC_REVISION([$Id: configure.in,v 11.14 2002/01/29 04:59:03 cph Exp $])
 AC_INIT(boot.c)
 AC_CONFIG_HEADER(config.h)
 
@@ -111,7 +111,7 @@ AC_HEADER_TIME
 AC_CHECK_HEADERS(bsdtty.h fcntl.h limits.h malloc.h sgtty.h stropts.h time.h)
 AC_CHECK_HEADERS(sys/file.h sys/ioctl.h sys/mount.h sys/param.h sys/poll.h)
 AC_CHECK_HEADERS(sys/ptyio.h sys/socket.h sys/time.h sys/un.h sys/vfs.h)
-AC_CHECK_HEADERS(termio.h termios.h unistd.h utime.h)
+AC_CHECK_HEADERS(stdbool.h termio.h termios.h unistd.h utime.h)
 AC_CHECK_HEADERS(openssl/blowfish.h openssl/md5.h blowfish.h md5.h)
 AC_CHECK_HEADERS(mhash.h mcrypt.h gdbm.h curses.h term.h)
 
diff --git a/v7/src/microcode/confshared.h b/v7/src/microcode/confshared.h
index cdbfbc3a2..a2c289ef6 100644
--- a/v7/src/microcode/confshared.h
+++ b/v7/src/microcode/confshared.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: confshared.h,v 11.1 2000/12/05 21:23:43 cph Exp $
+$Id: confshared.h,v 11.2 2002/01/29 04:58:46 cph Exp $
 
-Copyright (c) 2000 Massachusetts Institute of Technology
+Copyright (c) 2000, 2002 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -16,7 +16,8 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+USA.
 */
 
 /* Shared part of "config.h".  */
@@ -47,8 +48,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 /* These C type definitions are needed by everybody.
    They should not be here, but it is unavoidable. */
 typedef char Boolean;
-#define true		((Boolean) TRUE)
-#define false		((Boolean) FALSE)
+#ifdef HAVE_STDBOOL_H
+#  include <stdbool.h>
+#else
+#  define true		((Boolean) TRUE)
+#  define false		((Boolean) FALSE)
+#endif
 
 /* This is the Scheme object type.
    The various fields are defined in "object.h". */
-- 
2.25.1