7 files changed, 51 insertions, 7 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1361de31071..ad5666c9383 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -6,6 +6,11 @@
 	* inclhack.def:  add new tests
 	* tests/base/arch/i960/archI960.h:  New test result
 	* tests/base/curses.h: modified test result
+	* tests/base/stdio.h: ditto
+	* tests/base/time.h: ditto
+	* tests/base/sys/asm.h: ditto
+	* tests/base/sys/stat.h: ditto
+	* tests/base/sys/wait.h: ditto
 
 Wed May 31 13:17:20 2000  Philippe De Muyter  <phdm@macqel.be>
 
diff --git a/gcc/fixinc/check.tpl b/gcc/fixinc/check.tpl
index a4be5ed0711..5bc8aa3e5aa 100644
--- a/gcc/fixinc/check.tpl
+++ b/gcc/fixinc/check.tpl
@@ -123,7 +123,7 @@ do
     :
 
   else
-    diff -c $f ${TESTBASE}/$f >&2
+    diff -c $f ${TESTBASE}/$f >&2 || :
     exitok=false
   fi
 done
diff --git a/gcc/fixinc/tests/base/stdio.h b/gcc/fixinc/tests/base/stdio.h
index a050aa3487b..999ff4d92f3 100644
--- a/gcc/fixinc/tests/base/stdio.h
+++ b/gcc/fixinc/tests/base/stdio.h
@@ -32,4 +32,23 @@ extern int rename(const char *_old, const char *_new);
 
 #endif  /* STDIO_STDARG_H_CHECK */
 
+
+#if defined( ULTRIX_CONST_CHECK )
+extern void perror( const char *__s );
+extern int fputs( const char *__s, FILE *);
+extern size_t fwrite( const void *__ptr, size_t, size_t, FILE *);
+extern int fscanf( FILE *__stream, const char *__format, ...);
+extern int scanf( const char *__format, ...);
+
+#endif  /* ULTRIX_CONST_CHECK */
+
+
+#if defined( ULTRIX_CONST2_CHECK )
+extern FILE *fopen( const char *__filename, const char *__type );
+extern int sscanf( const char *__s, const char *__format, ...);
+extern FILE *popen( const char *, const char *);
+extern char *tempnam( const char *, const char *);
+
+#endif  /* ULTRIX_CONST2_CHECK */
+
 #endif  /* FIXINC_STDIO_STDARG_H_CHECK */
diff --git a/gcc/fixinc/tests/base/sys/asm.h b/gcc/fixinc/tests/base/sys/asm.h
index 9b9b5c28adf..7d940fb53e3 100644
--- a/gcc/fixinc/tests/base/sys/asm.h
+++ b/gcc/fixinc/tests/base/sys/asm.h
@@ -1,5 +1,5 @@
 
 
 #if defined( IRIX_ASM_APOSTROPHE_CHECK )
-# and we are on vacation
+	# and we are on vacation
 #endif  /* IRIX_ASM_APOSTROPHE_CHECK */
diff --git a/gcc/fixinc/tests/base/sys/stat.h b/gcc/fixinc/tests/base/sys/stat.h
index 52d05f328df..d29e4575a05 100644
--- a/gcc/fixinc/tests/base/sys/stat.h
+++ b/gcc/fixinc/tests/base/sys/stat.h
@@ -16,7 +16,7 @@ extern int fchmod(int, mode_t);
 extern "C" {
 #endif /* __cplusplus */
 static int	stat(const char *__f, struct stat *__p) {
-return __stat32(__f, __p);
+	return __stat32(__f, __p);
 }
 #if __cplusplus
  }
@@ -27,13 +27,20 @@ return __stat32(__f, __p);
 extern "C" {
 #endif /* __cplusplus */
 static int	stat(__f, __p)
-char *__f;
-struct stat *__p;
+	char *__f;
+	struct stat *__p;
 {
-return __stat32(__f, __p);
+	return __stat32(__f, __p);
 }
 #if __cplusplus
  }
 #endif /* __cplusplus */
 #endif
 #endif  /* SCO_STATIC_FUNC_CHECK */
+
+
+#if defined( VXWORKS_NEEDS_VXWORKS_CHECK )
+#include </dev/null> /* ULONG */
+# define	__INCstath <sys/stat.h>
+#include <types/vxTypesOld.h>
+#endif  /* VXWORKS_NEEDS_VXWORKS_CHECK */
diff --git a/gcc/fixinc/tests/base/sys/wait.h b/gcc/fixinc/tests/base/sys/wait.h
index 943fe2f7dc9..feb4414952d 100644
--- a/gcc/fixinc/tests/base/sys/wait.h
+++ b/gcc/fixinc/tests/base/sys/wait.h
@@ -4,7 +4,7 @@
 /* bos325, */
 struct rusage;
 extern pid_t wait3();
-/* pid_t wait3(int *, int, struct rusage *); */
+	/* pid_t wait3(int *, int, struct rusage *); */
 #endif  /* AIX_SYSWAIT_CHECK */
 
 
diff --git a/gcc/fixinc/tests/base/time.h b/gcc/fixinc/tests/base/time.h
index 3d4a089fed7..2e6ca66cef2 100644
--- a/gcc/fixinc/tests/base/time.h
+++ b/gcc/fixinc/tests/base/time.h
@@ -12,4 +12,17 @@
 unsigned int	_clocks_per_sec;
 #endif  /* VXWORKS_NEEDS_VXTYPES_CHECK */
 
+
+#if defined( VXWORKS_TIME_CHECK )
+#ifndef __gcc_VOIDFUNCPTR_defined
+#ifdef __cplusplus
+typedef void (*__gcc_VOIDFUNCPTR) (...);
+#else
+typedef void (*__gcc_VOIDFUNCPTR) ();
+#endif
+#define __gcc_VOIDFUNCPTR_defined
+#endif
+#define VOIDFUNCPTR __gcc_VOIDFUNCPTR
+#endif  /* VXWORKS_TIME_CHECK */
+
 #endif  /* FIXINC_M88K_MULTI_INCL_CHECK */