diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fixinc/fixincl.x | 4 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 11 |
3 files changed, 11 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 33096a35db8..e2940b2300e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2000-08-12 Eli Zaretskii <eliz@is.elta.co.il> + + * fixinc/inclhack.def (sysv68_string): Fix the Sed script so it + works inside fixincl. + Wed Aug 23 04:55:48 2000 Alexandre Oliva <aoliva@redhat.com> * simplify-rtx.c (simplify_rtx): Don't pass VOIDmode to diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 14c697f6f83..746a5e375cd 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -4217,12 +4217,12 @@ const char* apzSysv68_StringPatch[] = { "sed", "-e", "s/strdup(char \\*s1);/strdup(const char *s1);/", "-e", "/^extern char$/N", "-e", "s/^extern char\\(\\n\t\\*memccpy(),\\)$/extern void\\1/", + "-e", "/^extern int$/N", + "-e", "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/", "-e", "/^\tstrncmp(),$/N", "-e", "s/^\\(\tstrncmp()\\),\\n\\(\tstrlen(),\\)$/\\1;\\\n\ extern unsigned int\\\n\ \\2/", - "-e", "/^extern int$/N", - "-e", "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index b1172d72779..cfc545a1070 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -2587,17 +2587,13 @@ fix = { sed = "/^extern char$/N"; sed = "s/^extern char\\(\\n\t\\*memccpy(),\\)$/extern void\\1/"; - /* - * This sed expression is broken inside fixincl. - * The same expression seems to work outside, however :-( - */ + sed = "/^extern int$/N"; + sed = "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/"; + sed = "/^\tstrncmp(),$/N"; sed = 's/^\(' "\t" 'strncmp()\),\n\(' "\t" 'strlen(),\)$/' '\1;' "\\\nextern unsigned int\\\n\\2/"; - sed = "/^extern int$/N"; - sed = "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/"; - test_text = "extern int strlen();\n" @@ -2608,6 +2604,7 @@ fix = { "\tmemcpy();\n" "extern int\n" + "\tstrcmp(),\n" "\tstrncmp(),\n" "\tstrlen(),\n" "\tstrspn();\n" |