# HG changeset patch # User Christian Brabandt # Date 1506542405 -7200 # Node ID a75fea44fb77bdcbfbdcbbf24b2115c5b26cf77b # Parent 74ee9ad6d7d970d427f36cea54af5f638b6f0c88 patch 8.0.1157: compiler warning on MS-Windows commit https://github.com/vim/vim/commit/9cf39cc57f63f57b4a335cd25371eb456824f049 Author: Bram Moolenaar 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) diff --git a/src/main.c b/src/main.c --- 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 --- 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,