From caa859cdde89b29e003c9a0e9b469dd79effd516 Mon Sep 17 00:00:00 2001 From: brolley Date: Mon, 7 Dec 1998 12:42:21 +0000 Subject: Mon Dec 7 15:38:25 1998 Dave Brolley * gcc.c (default_compilers): Fix typo in USE_CPPLIB spec for cc1. Mon Dec 7 15:38:25 1998 Kaveh R. Ghazi * c-aux-info.c (concat): Wrap function definition in !USE_CPPLIB. * cppalloc.c: Move function `xcalloc' from cpplib.c to here. * cpplib.c: Move function `xcalloc' from here to cppalloc.c. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@24152 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/c-aux-info.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gcc/c-aux-info.c') diff --git a/gcc/c-aux-info.c b/gcc/c-aux-info.c index e6737c995dc..d86d44539fb 100644 --- a/gcc/c-aux-info.c +++ b/gcc/c-aux-info.c @@ -48,6 +48,10 @@ static char *gen_decl PROTO((tree, int, formals_style)); This function is based on the one in libiberty. */ +/* This definition will conflict with the one from prefix.c in + libcpp.a when linking cc1 and cc1obj. So only provide it if we are + not using libcpp.a */ +#ifndef USE_CPPLIB char * concat VPROTO((const char *first, ...)) { @@ -99,6 +103,7 @@ concat VPROTO((const char *first, ...)) return (newstr); } +#endif /* ! USE_CPPLIB */ /* Given a string representing an entire type or an entire declaration which only lacks the actual "data-type" specifier (at its left end), -- cgit v1.2.1