PATCH: HP/UX 10.20 char

Brendan Kehoe brendan@cygnus.com
Thu Jan 7 10:54:00 GMT 1999


Checked into egcs; fixes curses_colr/curses.h's typedef of bool if
__cplusplus.

B

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.


Index: fixincludes
===================================================================
RCS file: /cvs/egcs/egcs/gcc/fixincludes,v
retrieving revision 1.18
diff -u -p -r1.18 fixincludes
--- fixincludes	1999/01/03 20:16:10	1.18
+++ fixincludes	1999/01/07 03:39:21
@@ -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
 '\


-- 
Brendan Kehoe                                               brendan@cygnus.com
Cygnus Solutions, Sunnyvale, CA                                +1 408 542 9600

Web page: http://www.zen.org/~brendan/



More information about the Gcc-patches mailing list