diff options
| author | DJ Delorie <dj@redhat.com> | 2005-05-24 21:01:33 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2005-05-24 21:01:33 +0000 |
| commit | abf6a75b428517d9caaf9155212b0b10e0379a99 (patch) | |
| tree | 3476694dba1d2c731deb2a131b0d8d6c5dcb0cd3 /libiberty/concat.c | |
| parent | f127898a4db12540b9898e25777c6c3725d119bf (diff) | |
| download | gdb-abf6a75b428517d9caaf9155212b0b10e0379a99.zip gdb-abf6a75b428517d9caaf9155212b0b10e0379a99.tar.gz gdb-abf6a75b428517d9caaf9155212b0b10e0379a99.tar.bz2 | |
merge from gcc
Diffstat (limited to 'libiberty/concat.c')
| -rw-r--r-- | libiberty/concat.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libiberty/concat.c b/libiberty/concat.c index d890b81..1f329ea 100644 --- a/libiberty/concat.c +++ b/libiberty/concat.c @@ -127,7 +127,13 @@ concat_copy (char *dst, const char *first, ...) return save_dst; } +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ char *libiberty_concat_ptr; +#ifdef __cplusplus +} +#endif /* __cplusplus */ /* @undocumented concat_copy2 */ @@ -150,7 +156,7 @@ concat (const char *first, ...) /* First compute the size of the result and get sufficient memory. */ VA_OPEN (args, first); VA_FIXEDARG (args, const char *, first); - newstr = (char *) xmalloc (vconcat_length (first, args) + 1); + newstr = XNEWVEC (char, vconcat_length (first, args) + 1); VA_CLOSE (args); /* Now copy the individual pieces to the result string. */ @@ -188,7 +194,7 @@ reconcat (char *optr, const char *first, ...) VA_OPEN (args, first); VA_FIXEDARG (args, char *, optr); VA_FIXEDARG (args, const char *, first); - newstr = (char *) xmalloc (vconcat_length (first, args) + 1); + newstr = XNEWVEC (char, vconcat_length (first, args) + 1); VA_CLOSE (args); /* Now copy the individual pieces to the result string. */ |