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 b2a3e7f3d33128ae0f6193779e553b2e385139fb..8d6fdb8e03118817eb1a4a50a263d6b5090b1dd0 100644 (file)
--- 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 e4de8c16000e0d18e785ee00208f1eb24619930b..d18585d91bf2a5c532455c762d8cd845e85b84fb 100644 (file)
--- 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,
 /**/