1
0
forked from aniani/vim

patch 8.0.1018: warnings from 64-bit compiler

Problem:    Warnings from 64-bit compiler. (Christian Brabandt)
Solution:   Add type casts.
This commit is contained in:
Bram Moolenaar
2017-08-30 15:57:33 +02:00
parent dde6034111
commit 4ad3b2b588
2 changed files with 6 additions and 4 deletions

View File

@@ -1281,8 +1281,8 @@ term_paste_register(int prev_c UNUSED)
WCHAR *ret = NULL; WCHAR *ret = NULL;
int length = 0; int length = 0;
MultiByteToWideChar_alloc(enc_codepage, 0, (char*)s, STRLEN(s), MultiByteToWideChar_alloc(enc_codepage, 0, (char *)s,
&ret, &length); (int)STRLEN(s), &ret, &length);
if (ret != NULL) if (ret != NULL)
{ {
WideCharToMultiByte_alloc(CP_UTF8, 0, WideCharToMultiByte_alloc(CP_UTF8, 0,
@@ -1292,7 +1292,7 @@ term_paste_register(int prev_c UNUSED)
} }
#endif #endif
channel_send(curbuf->b_term->tl_job->jv_channel, PART_IN, channel_send(curbuf->b_term->tl_job->jv_channel, PART_IN,
s, STRLEN(s), NULL); s, (int)STRLEN(s), NULL);
#ifdef WIN3264 #ifdef WIN3264
if (tmp != s) if (tmp != s)
vim_free(s); vim_free(s);
@@ -1851,7 +1851,7 @@ handle_settermprop(
int length = 0; int length = 0;
MultiByteToWideChar_alloc(CP_UTF8, 0, MultiByteToWideChar_alloc(CP_UTF8, 0,
(char*)value->string, STRLEN(value->string), (char*)value->string, (int)STRLEN(value->string),
&ret, &length); &ret, &length);
if (ret != NULL) if (ret != NULL)
{ {

View File

@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1018,
/**/ /**/
1017, 1017,
/**/ /**/