From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 26 Jul 2020 13:55:25 +0000 (+0200)
Subject: patch 8.2.1299: compiler warning for using size_t for int and void pointer
X-Git-Tag: v8.2.1299
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d3bb6a82a51d549bbd597bb4e94d8f074009be2a;p=vim

patch 8.2.1299: compiler warning for using size_t for int and void pointer

Problem:    Compiler warning for using size_t for int and void pointer.
Solution:   Add type casts.
---

diff --git a/src/scriptfile.c b/src/scriptfile.c
index 2a8320832..b93e35138 100644
--- a/src/scriptfile.c
+++ b/src/scriptfile.c
@@ -157,18 +157,18 @@ estack_sfile(int is_sfile UNUSED)
 		last_type = entry->es_type;
 	    }
 	    len += STRLEN(type_name);
-	    if (ga_grow(&ga, len) == FAIL)
+	    if (ga_grow(&ga, (int)len) == FAIL)
 		break;
 	    if (idx == exestack.ga_len - 1 || entry->es_lnum == 0)
 		// For the bottom entry: do not add the line number, it is used
 		// in <slnum>.  Also leave it out when the number is not set.
-		vim_snprintf(ga.ga_data + ga.ga_len, len, "%s%s%s",
+		vim_snprintf((char *)ga.ga_data + ga.ga_len, len, "%s%s%s",
 				type_name, entry->es_name,
 				idx == exestack.ga_len - 1 ? "" : "..");
 	    else
-		vim_snprintf(ga.ga_data + ga.ga_len, len, "%s%s[%ld]..",
+		vim_snprintf((char *)ga.ga_data + ga.ga_len, len, "%s%s[%ld]..",
 				    type_name, entry->es_name, entry->es_lnum);
-	    ga.ga_len += STRLEN(ga.ga_data + ga.ga_len);
+	    ga.ga_len += (int)STRLEN((char *)ga.ga_data + ga.ga_len);
 	}
     }
 
diff --git a/src/version.c b/src/version.c
index 58a434a1b..93bcc4324 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1299,
 /**/
     1298,
 /**/