From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 19 Mar 2014 11:37:22 +0000 (+0100)
Subject: updated for version 7.4.206
X-Git-Tag: v7.4.206
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a0844a117068ff4d541eb17ef3c0566995e5d3c8;p=thirdparty%2Fvim.git

updated for version 7.4.206
Problem:    Compiler warnings on 64 bit Windows.
Solution:   Add type casts. (Mike Williams)
---

diff --git a/src/gui_w48.c b/src/gui_w48.c
index f4473f62c8..4d9032019f 100644
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -3078,7 +3078,7 @@ logfont2name(LOGFONT lf)
     if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
     {
 	int	len;
-	acp_to_enc(lf.lfFaceName, strlen(lf.lfFaceName),
+	acp_to_enc(lf.lfFaceName, (int)strlen(lf.lfFaceName),
 						(char_u **)&font_name, &len);
     }
 #endif
diff --git a/src/os_mswin.c b/src/os_mswin.c
index ec35029c33..871afad9d2 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -2884,7 +2884,7 @@ get_logfont(
     if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
     {
 	int	len;
-	enc_to_acp(name, strlen(name), &acpname, &len);
+	enc_to_acp(name, (int)strlen(name), &acpname, &len);
 	name = acpname;
     }
 #endif
diff --git a/src/version.c b/src/version.c
index 82817145bc..aabc366b0c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    206,
 /**/
     205,
 /**/