From e88604b0758fd5e62b6c0b80d8d8694e28c00226 Mon Sep 17 00:00:00 2001
From: neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 27 Aug 2003 02:19:07 +0000
Subject: [PATCH] 	* fixinc/tests/base/string.h,
 fixinc/tests/base/sys/regset.h: 	Fix to match produced versions. 
 * fixinc/inclhack.def (longlong_t): New disabled test, ported 	from
 fixinc.svr4.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70839 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog                      |  4 ++++
 gcc/fixinc/inclhack.def            | 15 +++++++++++++++
 gcc/fixinc/tests/base/string.h     |  6 +++---
 gcc/fixinc/tests/base/sys/regset.h |  2 +-
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1fc6a0d27f5..873f3f9af85 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2003-08-26  Nathanael Nerode  <neroden@gcc.gnu.org>
 
+	* fixinc/tests/base/string.h, fixinc/tests/base/sys/regset.h:
+	Fix to match produced versions.
+	* fixinc/inclhack.def (longlong_t): New disabled test, ported
+	from fixinc.svr4.
 	* fixinc/inclhack.def (ptx_pwd_h): New disabled fix, ported
 	from fixinc.ptx.
         * fixinc/inclhack.def (ptx_sys_mc_param_h): New disabled fix,
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 34e4b871119..a5ec61ff7ac 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -1653,6 +1653,21 @@ fix = {
 
 
 /*
+ * Apparently some SVR4 systems typedef longlong_t to long ?
+ */
+#ifdef SVR4
+fix = {
+    hackname  = longlong_t;
+    select    = "typedef[ \t]+(unsigned[ \t]+)?long[ \t]+(u_)?longlong_t";
+    c_fix     = format;
+    c_fix_arg = "typedef %1long long %2longlong_t";
+    test_text = "typedef long longlong_t\n"
+                "typedef unsigned long u_longlong_t";
+};
+#endif
+
+
+/*
  *  Delete the '#define void int' line from curses.h on Lynx
  */
 fix = {
diff --git a/gcc/fixinc/tests/base/string.h b/gcc/fixinc/tests/base/string.h
index f32c240ae34..d70f9e08a3a 100644
--- a/gcc/fixinc/tests/base/string.h
+++ b/gcc/fixinc/tests/base/string.h
@@ -8,6 +8,6 @@
     original, manufacturer supplied header file.  */
 
 #ifndef _STRING_INCLUDED
-#define _STRING_INCLUDED
-#include <strings.h>
-#endif /* _STRING_INCLUDED */
+  #define _STRING_INCLUDED
+  #include <strings.h>
+#endif /* _STRING_INCLUDED */
\ No newline at end of file
diff --git a/gcc/fixinc/tests/base/sys/regset.h b/gcc/fixinc/tests/base/sys/regset.h
index adc31add5dd..6723427e89c 100644
--- a/gcc/fixinc/tests/base/sys/regset.h
+++ b/gcc/fixinc/tests/base/sys/regset.h
@@ -11,7 +11,7 @@
 
 #if defined( SCO_REGSET_CHECK )
 union u_fps {
-    struct rsfpstate
+    struct	rsfpstate
     {
        int whatever;
     }
-- 
2.11.0