patch 8.0.0945: 64-bit compiler warnings

Problem: 64-bit compiler warnings. Solution: Use "size_t" instead of "int". (Mike Williams)
vim · Aug 14, 2017 · 60104f1 · 60104f1
1 parent d21b16f
commit 60104f1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/os_win32.c b/src/os_win32.c
@@ -5072,8 +5072,11 @@ make_job_env(garray_T *gap, dict_T *env)
 	    --todo;
 	    if (wkey != NULL && wval != NULL)
 	    {
-		int n, lkey = wcslen(wkey), lval = wcslen(wval);
-		if (ga_grow(gap, lkey + lval + 2) != OK)
+		int	n;
+		size_t	lkey = wcslen(wkey);
+		size_t	lval = wcslen(wval);
+
+		if (ga_grow(gap, (int)(lkey + lval + 2)) != OK)
 		    continue;
 		for (n = 0; n < lkey; n++)
 		    *((WCHAR*)gap->ga_data + gap->ga_len++) = wkey[n];

diff --git a/src/version.c b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    945,
 /**/
     944,
 /**/