changeset 12130:d3732b29ac5f v8.0.0945

patch 8.0.0945: 64-bit compiler warnings commit https://github.com/vim/vim/commit/60104f183cc639d2a5295ba157d4ec66ac19fa53 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Aug 14 23:25:04 2017 +0200 patch 8.0.0945: 64-bit compiler warnings Problem: 64-bit compiler warnings. Solution: Use "size_t" instead of "int". (Mike Williams)
author Christian Brabandt <cb@256bit.org>
date Mon, 14 Aug 2017 23:30:04 +0200
parents 532f6ee4a3c7
children 9741b54f8347
files src/os_win32.c src/version.c
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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];
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    945,
+/**/
     944,
 /**/
     943,