# HG changeset patch # User Christian Brabandt # Date 1502134205 -7200 # Node ID 7e704d75a882a4c555450dd406eba4c2a1ceadd0 # Parent 72a274bcae6bc86396a2c0a5b2a7272f0b68a712 patch 8.0.0888: compiler warnings with 64 bit build commit https://github.com/vim/vim/commit/116a0f800c6a62e29c5af832df092507f1355c68 Author: Bram Moolenaar Date: Mon Aug 7 21:17:57 2017 +0200 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) diff --git a/src/message.c b/src/message.c --- a/src/message.c +++ b/src/message.c @@ -2639,7 +2639,7 @@ msg_puts_printf(char_u *str, int maxlen) # if defined(FEAT_MBYTE) && !defined(FEAT_GUI_MSWIN) if (enc_codepage >= 0 && (int)GetConsoleCP() != enc_codepage) { - int inlen = STRLEN(str); + int inlen = (int)STRLEN(str); int outlen; WCHAR *widestr = (WCHAR *)enc_to_utf16(str, &inlen); diff --git a/src/os_mswin.c b/src/os_mswin.c --- a/src/os_mswin.c +++ b/src/os_mswin.c @@ -453,8 +453,9 @@ slash_adjust(char_u *p) if (*p == '`') { + size_t len = STRLEN(p); + /* don't replace backslash in backtick quoted strings */ - int len = STRLEN(p); if (len > 2 && *(p + len - 1) == '`') return; } diff --git a/src/os_win32.c b/src/os_win32.c --- a/src/os_win32.c +++ b/src/os_win32.c @@ -7031,7 +7031,8 @@ fix_arg_enc(void) * main.c, so this part add str as literal. */ if (literal == FALSE) { - int len = STRLEN(str); + size_t len = STRLEN(str); + if (len > 2 && *str == '`' && *(str + len - 1) == '`') literal = TRUE; } diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 888, +/**/ 887, /**/ 886,