diff options
author | Bram Moolenaar <Bram@vim.org> | 2017-08-14 23:25:04 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2017-08-14 23:25:04 +0200 |
commit | 60104f183cc639d2a5295ba157d4ec66ac19fa53 (patch) | |
tree | 27ed909588d2a03cc0ef518df3de18e48c9e5162 /src | |
parent | d21b16f3c0c676bfe3a37aef1ac3118e1ecded60 (diff) |
patch 8.0.0945: 64-bit compiler warningsv8.0.0945
Problem: 64-bit compiler warnings.
Solution: Use "size_t" instead of "int". (Mike Williams)
Diffstat (limited to 'src')
-rw-r--r-- | src/os_win32.c | 7 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index c6d9ad1671..1098d7f73e 100644 --- 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 index 882e3da527..d616e2567f 100644 --- 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, |