Commit: 1712e1d4f7d73b741c8390e11c10d1e162650874 - binutils_gdb (git)

Commit MetaInfo

• Révision: 1712e1d4f7d73b741c8390e11c10d1e162650874 (tree)
• l'heure: 2012-01-26 23:28:31
• Auteur: Jakub Jelinek <jakub@redh...>
• Commiter: Jakub Jelinek

Message de Log

* make-relative-prefix.c (make_relative_prefix_1): Avoid warning
about using preprocessor directives inside of macro arguments.

Change Summary

• modified: libiberty/ChangeLog
• modified: libiberty/make-relative-prefix.c

Modification

--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
[phone]  Jakub Jelinek  <[e-mail]>
+
+	* make-relative-prefix.c (make_relative_prefix_1): Avoid warning
+	about using preprocessor directives inside of macro arguments.
+
 2012-01-22  Douglas B Rupp  <[e-mail]>
 
 	* configure: Regenerate.

--- 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)