forked from aniani/vim
patch 8.0.0888: compiler warnings with 64 bit build
Problem: Compiler warnings with 64 bit build. Solution: Add type cast of change the type. (Mike Williams)
This commit is contained in:
@@ -2639,7 +2639,7 @@ msg_puts_printf(char_u *str, int maxlen)
|
|||||||
# if defined(FEAT_MBYTE) && !defined(FEAT_GUI_MSWIN)
|
# if defined(FEAT_MBYTE) && !defined(FEAT_GUI_MSWIN)
|
||||||
if (enc_codepage >= 0 && (int)GetConsoleCP() != enc_codepage)
|
if (enc_codepage >= 0 && (int)GetConsoleCP() != enc_codepage)
|
||||||
{
|
{
|
||||||
int inlen = STRLEN(str);
|
int inlen = (int)STRLEN(str);
|
||||||
int outlen;
|
int outlen;
|
||||||
WCHAR *widestr = (WCHAR *)enc_to_utf16(str, &inlen);
|
WCHAR *widestr = (WCHAR *)enc_to_utf16(str, &inlen);
|
||||||
|
|
||||||
|
@@ -453,8 +453,9 @@ slash_adjust(char_u *p)
|
|||||||
|
|
||||||
if (*p == '`')
|
if (*p == '`')
|
||||||
{
|
{
|
||||||
|
size_t len = STRLEN(p);
|
||||||
|
|
||||||
/* don't replace backslash in backtick quoted strings */
|
/* don't replace backslash in backtick quoted strings */
|
||||||
int len = STRLEN(p);
|
|
||||||
if (len > 2 && *(p + len - 1) == '`')
|
if (len > 2 && *(p + len - 1) == '`')
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@@ -7031,7 +7031,8 @@ fix_arg_enc(void)
|
|||||||
* main.c, so this part add str as literal. */
|
* main.c, so this part add str as literal. */
|
||||||
if (literal == FALSE)
|
if (literal == FALSE)
|
||||||
{
|
{
|
||||||
int len = STRLEN(str);
|
size_t len = STRLEN(str);
|
||||||
|
|
||||||
if (len > 2 && *str == '`' && *(str + len - 1) == '`')
|
if (len > 2 && *str == '`' && *(str + len - 1) == '`')
|
||||||
literal = TRUE;
|
literal = TRUE;
|
||||||
}
|
}
|
||||||
|
@@ -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 */
|
||||||
|
/**/
|
||||||
|
888,
|
||||||
/**/
|
/**/
|
||||||
887,
|
887,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user