diff options
| author | Nathanael Nerode <neroden@gcc.gnu.org> | 2003-08-27 02:19:07 +0000 |
|---|---|---|
| committer | Nathanael Nerode <neroden@gcc.gnu.org> | 2003-08-27 02:19:07 +0000 |
| commit | 88f505f68080b0245cd3d3d4058736371bcafbf2 (patch) | |
| tree | 28b4f90951a621f3d590595ffb56b2ea05ec2f5f | |
| parent | 522df488848b3a3989032f895118e49a242c82d5 (diff) | |
| download | gcc-88f505f68080b0245cd3d3d4058736371bcafbf2.zip gcc-88f505f68080b0245cd3d3d4058736371bcafbf2.tar.gz gcc-88f505f68080b0245cd3d3d4058736371bcafbf2.tar.bz2 | |
string.h, regset.h: Fix to match produced versions.
* 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.
From-SVN: r70839
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 15 | ||||
| -rw-r--r-- | gcc/fixinc/tests/base/string.h | 6 | ||||
| -rw-r--r-- | gcc/fixinc/tests/base/sys/regset.h | 2 |
4 files changed, 23 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1fc6a0d..873f3f9 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 34e4b87..a5ec61f 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 f32c240..d70f9e0 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 adc31ad..6723427 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; } |