diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2012-01-26 14:28:30 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2012-01-26 14:28:30 +0000 |
| commit | 0cd06da54e711b00316b142b107e96380f5e5850 (patch) | |
| tree | 2234d0dfc4804b3c9a297d1ec2c0553be3161f96 /libiberty | |
| parent | 70367c743a179cd2c7c3daa1e292129a11ffb19b (diff) | |
| download | binutils-redhat-0cd06da54e711b00316b142b107e96380f5e5850.tar.gz | |
* make-relative-prefix.c (make_relative_prefix_1): Avoid warning
about using preprocessor directives inside of macro arguments.
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 5 | ||||
| -rw-r--r-- | libiberty/make-relative-prefix.c | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 1e9b95aa39..5f492cc397 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2012-01-26 Jakub Jelinek <jakub@redhat.com> + + * make-relative-prefix.c (make_relative_prefix_1): Avoid warning + about using preprocessor directives inside of macro arguments. + 2012-01-22 Douglas B Rupp <rupp@gnat.com> * configure: Regenerate. diff --git a/libiberty/make-relative-prefix.c b/libiberty/make-relative-prefix.c index 7239e7b0ba..fe639d18bd 100644 --- a/libiberty/make-relative-prefix.c +++ b/libiberty/make-relative-prefix.c @@ -248,14 +248,15 @@ make_relative_prefix_1 (const char *progname, const char *bin_prefix, { char *startp, *endp, *nstore; size_t prefixlen = strlen (temp) + 1; + size_t len; if (prefixlen < 2) prefixlen = 2; - nstore = (char *) alloca (prefixlen + strlen (progname) + 1 + len = prefixlen + strlen (progname) + 1; #ifdef HAVE_HOST_EXECUTABLE_SUFFIX - + strlen (HOST_EXECUTABLE_SUFFIX) + len += strlen (HOST_EXECUTABLE_SUFFIX); #endif - ); + nstore = (char *) alloca (len); startp = endp = temp; while (1) |