diff --git a/src/main.c b/src/main.c
index 3b18bf1..fd96f41 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2573,7 +2573,7 @@
 	     * 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 902b05c..cf76f81 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1157,
+/**/
     1156,
 /**/
     1155,