diff options
| author | brolley <brolley@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-12-07 12:42:21 +0000 |
|---|---|---|
| committer | brolley <brolley@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-12-07 12:42:21 +0000 |
| commit | caa859cdde89b29e003c9a0e9b469dd79effd516 (patch) | |
| tree | 0e06ddfb7c06a8eb1366ed235d653e8ced12b583 /gcc/c-aux-info.c | |
| parent | 2c7e6296b92e67337b5386204b09594e4d946655 (diff) | |
| download | gcc-caa859cdde89b29e003c9a0e9b469dd79effd516.tar.gz | |
Mon Dec 7 15:38:25 1998 Dave Brolley <brolley@cygnus.com>
* gcc.c (default_compilers): Fix typo in USE_CPPLIB spec for cc1.
Mon Dec 7 15:38:25 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* 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
Diffstat (limited to 'gcc/c-aux-info.c')
| -rw-r--r-- | gcc/c-aux-info.c | 5 |
1 files changed, 5 insertions, 0 deletions
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), |