patch 8.0.1157: compiler warning on MS-Windows

Problem:    Compiler warning on MS-Windows.
Solution:   Add type cast. (Yasuhiro Matsomoto)

diff --git a/src/main.c b/src/main.c
index 3b18bf1e414e3d123a04f545ddb6e44e563c0534..fd96f41bde0db110bde25d5df9980c916cdc5a62 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -2573,7 +2573,7 @@ check_tty(mparm_T *parmp)
             * Note that the message is shown on a Cygwin terminal (e.g.
             * mintty) which encoding is based on $LC_ALL or etc., not the
             * current codepage used by normal Win32 console programs. */
-           tofree = s = enc_locale_env(NULL);
+           tofree = s = (char *)enc_locale_env(NULL);
            if (s == NULL)
                s = "utf-8";    /* Use "utf-8" by default. */
            (void)bind_textdomain_codeset(VIMPACKAGE, s);

diff --git a/src/version.c b/src/version.c
index 902b05c76bbff8f763262d2dc7713260cf0f6529..cf76f81d5212434c0516be8a05b4e9e79a1d2565 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1157,
 /**/
     1156,
 /**/