fixtests.c (stdc_0_in_system_headers_test): Must return "FIX" when fixincl is operating in test mode

	* fixinc/fixtests.c(stdc_0_in_system_headers_test): Must return "FIX"
	when fixincl is operating in test mode
	* fixinc/inclhack.def(AAB_dgux_int_varargs) : aesthetics
	(AAB_ultrix_limits): remove redundant text
	(AAB_ultrix_memory): ditto
	(AAB_ultrix_string): ditto
	(djgpp_wchar_h): fix the test text
	(irix_stdio_va_list): add test text
	(irix_limits_const): add a testing output file (limits.h is overwritten)
	(strict_ansi_not_ctd): put limits.h second in list for same reason
	(solaris27_mutex_init): test text needed selection text, too

	* fixinc/fixtests.c(stdc_0_in_system_headers_test): in testing mode,
	always apply the fix

From-SVN: r42642

2 files changed, 29 insertions, 21 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b8d7ca6..3c9128c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -2,6 +2,18 @@
 
 	* fixinc/fixtests.c(stdc_0_in_system_headers_test): Must return "FIX"
 	when fixincl is operating in test mode
+	* fixinc/inclhack.def(AAB_dgux_int_varargs) : aesthetics
+	(AAB_ultrix_limits): remove redundant text
+	(AAB_ultrix_memory): ditto
+	(AAB_ultrix_string): ditto
+	(djgpp_wchar_h): fix the test text
+	(irix_stdio_va_list): add test text
+	(irix_limits_const): add a testing output file (limits.h is overwritten)
+	(strict_ansi_not_ctd): put limits.h second in list for same reason
+	(solaris27_mutex_init): test text needed selection text, too
+
+	* fixinc/fixtests.c(stdc_0_in_system_headers_test): Must return "FIX"
+	when fixincl is operating in test mode
 
 2001-05-26  Philip Blundell  <philb@gnu.org>
 
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 6c13898..03b99cf 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -104,7 +104,8 @@ fix = {
 fix = {
     hackname = AAB_dgux_int_varargs;
     files    = _int_varargs.h;
-    replace  = "#ifndef __INT_VARARGS_H
+    replace  =
+"#ifndef __INT_VARARGS_H
 \#define __INT_VARARGS_H
 
 /************************************************************************/
@@ -537,9 +538,7 @@ fix = {
     files    = limits.h;
     mach     = "*-*-ultrix4.3";
     replace  =
-'/*	@(#)limits.h				*/
-/* This file was generated by fixincludes	*/
-\#ifndef _LIMITS_INCLUDED
+'#ifndef _LIMITS_INCLUDED
 \#define _LIMITS_INCLUDED
 \#include <sys/limits.h>
 \#endif /* _LIMITS_INCLUDED */
@@ -557,9 +556,7 @@ fix = {
     files    = memory.h;
     mach     = "*-*-ultrix4.3";
     replace  =
-'/*	@(#)memory.h				*/
-/* This file was generated by fixincludes	*/
-\#ifndef _MEMORY_INCLUDED
+'#ifndef _MEMORY_INCLUDED
 \#define _MEMORY_INCLUDED
 \#include <strings.h>
 \#endif /* _MEMORY_INCLUDED */
@@ -577,9 +574,7 @@ fix = {
     files    = string.h;
     mach     = "*-*-ultrix4.3";
     replace  =
-'/*	@(#)string.h				*/
-/* This file was generated by fixincludes	*/
-\#ifndef _STRING_INCLUDED
+'#ifndef _STRING_INCLUDED
 \#define _STRING_INCLUDED
 \#include <strings.h>
 \#endif /* _STRING_INCLUDED */
@@ -1035,7 +1030,8 @@ fix = {
     c_fix     = format;
     c_fix_arg = "%0\n#include <sys/djtypes.h>";
     c_fix_arg = "#include <stddef.h>";
-    test_text = "__DJ_wint_t\n#undef __DJ_wint_t\n#define __DJ_wint_t";
+    test_text = "#include <stddef.h>\n"
+                "extern __DJ_wint_t x;\n";
 };
 
 /*
@@ -1350,6 +1346,8 @@ fix = {
     select = '(printf\(.*), /\* va_list \*/ char \*';
     c_fix  = format;
     c_fix_arg = "%1, __gnuc_va_list";
+    test_text =
+    "extern int printf( const char *, /* va_list */ char * );";
 };
 
 
@@ -1358,11 +1356,11 @@ fix = {
  */
 fix = {
     hackname	= irix_limits_const;
-    files	= limits.h;
+    files	= fixinc-test-limits.h, limits.h;
     select	= "^extern const ";
     c_fix	= format;
     c_fix_arg	= "extern __const ";
-    test_text   = "extern const char limit; /* test\n\tlimits */";
+    test_text   = "extern const char limit; /* test limits */";
 };
 
 
@@ -1994,7 +1992,8 @@ fix = {
                 "#if __STDC__ == 0\n"
                 "#if __STDC__ != 1\n"
                 "#if __STDC__ - 0 == 0"
-               "/* not std C */\nint foo;\n#endif";
+               "/* not std C */\nint foo;\n"
+               "\n#end-end-end-end-if :-)";
 };
 
 /*
@@ -2003,12 +2002,7 @@ fix = {
  */
 fix = {
     hackname = strict_ansi_not_ctd;
-    files="limits.h";
-    files="math.h";
-    files="stdio.h";
-    files="signal.h";
-    files="stdlib.h";
-    files="time.h";
+    files    = math.h, limits.h, stdio.h, signal.h, stdlib.h, time.h;
     select   = "^([ \t]*[|&][|&][ \t(]*)"
                "(__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*0"
                ")(.*)";
@@ -2073,7 +2067,9 @@ fix = {
   c_fix = format;
   c_fix_arg = "%1, {0}}";
   c_fix_arg = "(define[ \t]+PTHREAD_MUTEX_INITIALIZER.*),[ \t]*0}$";
-  test_text = "#define PTHREAD_MUTEX_INITIALIZER {{{0},0}, {{{0}}}, 0}";
+  test_text =
+  '#ident "@(#)pthread.h  1.26  98/04/12 SMI"'"\n"
+  "#define PTHREAD_MUTEX_INITIALIZER {{{0},0}, {{{0}}}, 0}";
 };