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
index e548fc0c97c31a9b2951ea52185855354743ec45..62e6bfe1ef6f6c85243a67eff9ac50958e2a8f16 100644 (file)
--- 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
index 374a2399c566991c2d7d3625903c8f2e1dc3bf85..815454955c12ff649589c5178c0d296554b7a109 100644 (file)
--- 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
index 6c1a3dbdef59b4a145508e88c24f8aa16c4cde4d..2ee3f2e1765dd6ff1b28273d0b2f9a065937b849 100644 (file)
--- 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
index 29703ed717cdaae85dbbdaf8995d1cba06d2d91b..5a1660aa76b54ba5941b3909f2511c53ff93b678 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 */
+/**/
+    888,
 /**/
     887,
 /**/