From 884ba59aa22d84aaab942ddebc6d23cf5c4a11bf Mon Sep 17 00:00:00 2001
From: Brendan Kehoe <brendan@cygnus.com>
Date: Wed, 6 Jan 1999 22:05:45 +0000
Subject: [PATCH] fixincludes: For HP/UX 10.20, also look in
 curses_colr/curses.h for a typedef of bool.

        * fixincludes: For HP/UX 10.20, also look in curses_colr/curses.h
        for a typedef of bool.  Make sure to have a copy of the file is
        in place before we look to fix it.  Fix typo in variable name to
        FILE.

From-SVN: r24542
---
 gcc/ChangeLog   |  7 +++++++
 gcc/fixincludes | 20 ++++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 56a362c..c9d88a9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+1999-01-06  Brendan Kehoe  <brendan@cygnus.com>
+
+	* fixincludes: For HP/UX 10.20, also look in curses_colr/curses.h
+	for a typedef of bool.  Make sure to have a copy of the file is
+	in place before we look to fix it.  Fix typo in variable name to
+	FILE.
+
 Wed Jan  6 07:51:05 1999  Richard Henderson  <rth@cygnus.com>
 
 	* expr.c (expand_builtin) [case BUILT_IN_CONSTANT_P]: Use
diff --git a/gcc/fixincludes b/gcc/fixincludes
index 5943dc2..03792ea 100755
--- a/gcc/fixincludes
+++ b/gcc/fixincludes
@@ -2214,16 +2214,16 @@ if [ -r ${LIB}/$file ]; then
 fi
 
 # For C++, avoid any typedef or macro definition of bool, and use the
-# built in type instead.
-for files in curses.h; do
-  if [ -r $file ] && egrep bool $file >/dev/null 2>&1; then
-    if [ ! -r ${LIB}/$file ]; then
-      cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
-      chmod +w ${LIB}/$file 2>/dev/null
-      chmod a+r ${LIB}/$file 2>/dev/null
-    fi
-
-    echo Fixing $file
+# built in type instead.  HP/UX 10.20, at least, also has it
+# in curses_colr/curses.h.
+for file in curses.h curses_colr/curses.h ; do
+  if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
+    cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
+    chmod +w ${LIB}/$file 2>/dev/null
+    chmod a+r ${LIB}/$file 2>/dev/null
+  fi
+  if [ -r ${LIB}/$file ] && egrep bool ${LIB}/$file >/dev/null 2>&1; then
+    echo Fixing $file, typedef or macro for bool is invalid in C++
     sed -e '/^#[ 	]*define[ 	][ 	]*bool[ 	][ 	]*char[ 	]*$/i\
 #ifndef __cplusplus
 '\
-- 
2.7.4