merge with 3.8

diff --git a/lib/backupfile.c b/lib/backupfile.c
index f15e530bff759a2ca4b2fec698800467dd369b0e..670db0f5d521bd8d822c8edfee702398bd0e78ce 100644 (file)
--- a/lib/backupfile.c
+++ b/lib/backupfile.c
@@ -216,7 +216,7 @@ concat (str1, str2)
      char *str1, *str2;
 {
   char *newstr;
-  char str1_length = strlen (str1);
+  int str1_length = strlen (str1);
 
   newstr = malloc (str1_length + strlen (str2) + 1);
   if (newstr == 0)