From a74d78dd51d21fb465e6dd4dc64ee481b22e5a3f Mon Sep 17 00:00:00 2001 From: "Kaveh R. Ghazi" Date: Fri, 27 Nov 1998 10:13:07 +0000 Subject: [PATCH] fini.c: Rename variable `spaces' to `xspaces' to avoid conflicting with function... * fini.c: Rename variable `spaces' to `xspaces' to avoid conflicting with function `spaces' from libiberty. * g77spec.c: Don't prototype libiberty functions. * malloc.c: Likewise. From-SVN: r23933 --- gcc/f/ChangeLog | 8 ++++++++ gcc/f/fini.c | 34 +++++++++++++++++----------------- gcc/f/g77spec.c | 2 -- gcc/f/malloc.c | 4 ---- 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog index 8dc4bd8e2d3..624de916e47 100644 --- a/gcc/f/ChangeLog +++ b/gcc/f/ChangeLog @@ -1,3 +1,11 @@ +Fri Nov 27 13:10:32 1998 Kaveh R. Ghazi + + * fini.c: Rename variable `spaces' to `xspaces' to avoid + conflicting with function `spaces' from libiberty. + + * g77spec.c: Don't prototype libiberty functions. + * malloc.c: Likewise. + 1998-11-20 Dave Love * g77.texi: Assorted minor changes. diff --git a/gcc/f/fini.c b/gcc/f/fini.c index dc7cb24db6f..a51000bba7d 100644 --- a/gcc/f/fini.c +++ b/gcc/f/fini.c @@ -62,7 +62,7 @@ static FILE *out; static char prefix[32]; static char postfix[32]; static char storage[32]; -static char *spaces[] +static char *xspaces[] = { "", /* 0 */ @@ -636,7 +636,7 @@ testname (bool nested, int indent, name first, name last) int numhalf; assert (!nested || indent >= 2); - assert (((size_t) indent) + 4 < ARRAY_SIZE (spaces)); + assert (((size_t) indent) + 4 < ARRAY_SIZE (xspaces)); num = 0; numhalf = 0; @@ -654,15 +654,15 @@ testname (bool nested, int indent, name first, name last) "\ %s{\n\ ", - spaces[indent - 2]); + xspaces[indent - 2]); fprintf (out, "\ %sif ((c = ffesrc_strcmp_2c (ffe_case_match (), p, \"%s\", \"%s\", \"%s\")) == 0)\n\ %sreturn %s%s%s;\n\ ", - spaces[indent], nhalf->name_uc, nhalf->name_lc, nhalf->name_ic, - spaces[indent + 2], prefix, nhalf->kwname, postfix); + xspaces[indent], nhalf->name_uc, nhalf->name_lc, nhalf->name_ic, + xspaces[indent + 2], prefix, nhalf->kwname, postfix); if (num != 1) { @@ -670,14 +670,14 @@ testname (bool nested, int indent, name first, name last) "\ %selse if (c < 0)\n\ ", - spaces[indent]); + xspaces[indent]); if (numhalf == 0) fprintf (out, "\ %s;\n\ ", - spaces[indent + 2]); + xspaces[indent + 2]); else testname (TRUE, indent + 4, first, nhalf->previous); @@ -687,7 +687,7 @@ testname (bool nested, int indent, name first, name last) "\ %selse\n\ ", - spaces[indent]); + xspaces[indent]); testname (TRUE, indent + 4, nhalf->next, last); } @@ -698,7 +698,7 @@ testname (bool nested, int indent, name first, name last) "\ %s}\n\ ", - spaces[indent - 2]); + xspaces[indent - 2]); } void @@ -710,7 +710,7 @@ testnames (bool nested, int indent, int len, name first, name last) int numhalf; assert (!nested || indent >= 2); - assert (((size_t) indent) + 4 < ARRAY_SIZE (spaces)); + assert (((size_t) indent) + 4 < ARRAY_SIZE (xspaces)); num = 0; numhalf = 0; @@ -728,15 +728,15 @@ testnames (bool nested, int indent, int len, name first, name last) "\ %s{\n\ ", - spaces[indent - 2]); + xspaces[indent - 2]); fprintf (out, "\ %sif ((c = ffesrc_strncmp_2c (ffe_case_match (), p, \"%s\", \"%s\", \"%s\", %d)) == 0)\n\ %sreturn %s%s%s;\n\ ", - spaces[indent], nhalf->name_uc, nhalf->name_lc, nhalf->name_ic, - len, spaces[indent + 2], prefix, nhalf->kwname, postfix); + xspaces[indent], nhalf->name_uc, nhalf->name_lc, nhalf->name_ic, + len, xspaces[indent + 2], prefix, nhalf->kwname, postfix); if (num != 1) { @@ -744,14 +744,14 @@ testnames (bool nested, int indent, int len, name first, name last) "\ %selse if (c < 0)\n\ ", - spaces[indent]); + xspaces[indent]); if (numhalf == 0) fprintf (out, "\ %s;\n\ ", - spaces[indent + 2]); + xspaces[indent + 2]); else testnames (TRUE, indent + 4, len, first, nhalf->previous); @@ -761,7 +761,7 @@ testnames (bool nested, int indent, int len, name first, name last) "\ %selse\n\ ", - spaces[indent]); + xspaces[indent]); testnames (TRUE, indent + 4, len, nhalf->next, last); } @@ -772,5 +772,5 @@ testnames (bool nested, int indent, int len, name first, name last) "\ %s}\n\ ", - spaces[indent - 2]); + xspaces[indent - 2]); } diff --git a/gcc/f/g77spec.c b/gcc/f/g77spec.c index d5d6ccdd511..3cc2ac7724c 100644 --- a/gcc/f/g77spec.c +++ b/gcc/f/g77spec.c @@ -92,8 +92,6 @@ static void (*g77_fn)(); static int g77_newargc; static char **g77_newargv; -extern char *xmalloc PROTO((size_t)); - extern char *version_string; /* --- This comes from gcc.c (2.8.1) verbatim: */ diff --git a/gcc/f/malloc.c b/gcc/f/malloc.c index 905d49c4b30..d7041c3bd91 100644 --- a/gcc/f/malloc.c +++ b/gcc/f/malloc.c @@ -33,10 +33,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "proj.h" #include "malloc.h" -/* Assume gcc/toplev.o is linked in. */ -void *xmalloc (unsigned size); -void *xrealloc (void *ptr, int size); - /* Externals defined here. */ struct _malloc_root_ malloc_root_