patch 8.0.0945: 64-bit compiler warnings v8.0.0945
authorBram Moolenaar <Bram@vim.org>
Mon, 14 Aug 2017 21:25:04 +0000 (23:25 +0200)
committerBram Moolenaar <Bram@vim.org>
Mon, 14 Aug 2017 21:25:04 +0000 (23:25 +0200)
Problem:    64-bit compiler warnings.
Solution:   Use "size_t" instead of "int". (Mike Williams)

src/os_win32.c
src/version.c

index c6d9ad1671f991e109817efb5f23aa3d9b8f2ccd..1098d7f73e4521937acc35d7fae8754cc6fc5d35 100644 (file)
@@ -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];
index 882e3da52727165ea28089c311dda3cd409ad97a..d616e2567f91126d8957fdc3fe70a6a9bb4f2099 100644 (file)
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    945,
 /**/
     944,
 /**/