changeset 12557:a75fea44fb77 v8.0.1157

patch 8.0.1157: compiler warning on MS-Windows commit https://github.com/vim/vim/commit/9cf39cc57f63f57b4a335cd25371eb456824f049 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Sep 27 21:46:19 2017 +0200 patch 8.0.1157: compiler warning on MS-Windows Problem: Compiler warning on MS-Windows. Solution: Add type cast. (Yasuhiro Matsomoto)
author Christian Brabandt <cb@256bit.org>
date Wed, 27 Sep 2017 22:00:05 +0200
parents 74ee9ad6d7d9
children 0826d285daac
files src/main.c src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1157,
+/**/
     1156,
 /**/
     1155,