From: Bram Moolenaar Date: Wed, 30 Aug 2017 13:57:33 +0000 (+0200) Subject: patch 8.0.1018: warnings from 64-bit compiler X-Git-Tag: v8.0.1018 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ad3b2b588f0f591dcc53096c46ec1b5e80af49f;p=vim patch 8.0.1018: warnings from 64-bit compiler Problem: Warnings from 64-bit compiler. (Christian Brabandt) Solution: Add type casts. --- diff --git a/src/terminal.c b/src/terminal.c index b2a3e7f3d..8d6fdb8e0 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -1281,8 +1281,8 @@ term_paste_register(int prev_c UNUSED) WCHAR *ret = NULL; int length = 0; - MultiByteToWideChar_alloc(enc_codepage, 0, (char*)s, STRLEN(s), - &ret, &length); + MultiByteToWideChar_alloc(enc_codepage, 0, (char *)s, + (int)STRLEN(s), &ret, &length); if (ret != NULL) { WideCharToMultiByte_alloc(CP_UTF8, 0, @@ -1292,7 +1292,7 @@ term_paste_register(int prev_c UNUSED) } #endif channel_send(curbuf->b_term->tl_job->jv_channel, PART_IN, - s, STRLEN(s), NULL); + s, (int)STRLEN(s), NULL); #ifdef WIN3264 if (tmp != s) vim_free(s); @@ -1851,7 +1851,7 @@ handle_settermprop( int length = 0; MultiByteToWideChar_alloc(CP_UTF8, 0, - (char*)value->string, STRLEN(value->string), + (char*)value->string, (int)STRLEN(value->string), &ret, &length); if (ret != NULL) { diff --git a/src/version.c b/src/version.c index e4de8c160..d18585d91 100644 --- 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 */ +/**/ + 1018, /**/ 1017, /**/