inclhack.def (avoid_bool): Enable match if typedefs are prepended by spaces.

        * fixinc/inclhack.def (avoid_bool): Enable match if typedefs are
        prepended by spaces.
        (sco5_stat_wrappers): New fix.   Make sys/stat.h C++ safe.
        * fixinc/fixincl.sh, fixinc/fixincl.x, fixinc/inclhack.sh: Rebuilt.

From-SVN: r26665

gcc/ChangeLog

+Mon Apr 26 23:55:50 1999  Robert Lipe  <robertlipe@usa.net>
+
+	* fixinc/inclhack.def (avoid_bool): Enable match if typedefs are 
+	prepended by spaces.
+	(sco5_stat_wrappers): New fix.   Make sys/stat.h C++ safe.
+	* fixinc/fixincl.sh, fixinc/fixincl.x, fixinc/inclhack.sh: Rebuilt.
+
 Mon Apr 26 23:28:54 1999  Mumit Khan  <khan@xraylith.wisc.edu>
                           Donn Terry  <donn@interix.com>
 

gcc/fixinc/fixincl.sh

@@ -6,7 +6,7 @@
 # files which are fixed to work correctly with ANSI C and placed in a
 # directory that GNU C will search.
 #
-# This script contains 103 fixup scripts.
+# This script contains 104 fixup scripts.
 #
 # See README-fixinc for more information.
 #

gcc/fixinc/inclhack.def

@@ -129,6 +129,12 @@ fix = {
 
     sed = "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/a\\\n"
                 "#endif\n";
+
+    sed = "/^[ ]*typedef[ \t][ \t]*unsigned char[ \t][ \t]*bool[ \t]*;/i\\\n"
+                "#ifndef __cplusplus\n";
+
+    sed = "/^[ ]*typedef[ \t][ \t]*unsigned char[ \t][ \t]*bool[ \t]*;/a\\\n"
+                "#endif\n";
 };
 
 
@@ -348,6 +354,27 @@ fix = {
     sed    = "s/ecd.cursor/ecd_cursor/";
 };
 
+/*
+ *  On SCO OpenServer 5.0.0 through (at least) 5.0.5 <sys/stat.h> contains
+ *  tiny static wrappers that aren't C++ safe.
+ */
+fix = {
+    hackname = sco5_stat_wrappers;
+    mach     = "i*86-*-sco3.2v5*";
+    files    = "sys/stat.h";
+
+    sed = "/^static int[ \t]*[a-z]*stat(/i\\\n"
+	"#ifdef __cplusplus\\\n"
+	"extern \"C\"\\\n"
+	"{\\\n"
+	"#endif\\\n";
+
+    sed = "/^}$/a\\\n"
+	"#ifdef __cplusplus\\\n"
+	"}\\\n"
+	"#endif \/* __cplusplus *\/\\\n";
+};
+
 
 
 /*