From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 27 Sep 2017 19:46:19 +0000 (+0200)
Subject: patch 8.0.1157: compiler warning on MS-Windows
X-Git-Tag: v8.0.1157
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9cf39cc57f63f57b4a335cd25371eb456824f049;p=vim

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 3b18bf1e4..fd96f41bd 100644
--- 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 902b05c76..cf76f81d5 100644
--- 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,
 /**/