summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2014-03-19 12:37:22 +0100
committerBram Moolenaar <bram@vim.org>2014-03-19 12:37:22 +0100
commit493c4cad13f1689d4b9d8c94fbdc09c87e514669 (patch)
tree38a4ed462b5ea321935b1662880766c5138eea39
parent846111a815766117dd83940c48a9bd6ed35d8299 (diff)
downloadvim-7.4.206.tar.gz
updated for version 7.4.206v7.4.206v7-4-206
Problem: Compiler warnings on 64 bit Windows. Solution: Add type casts. (Mike Williams)
-rw-r--r--src/gui_w48.c2
-rw-r--r--src/os_mswin.c2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/gui_w48.c b/src/gui_w48.c
index f4473f62..4d903201 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 ec35029c..871afad9 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 82817145..aabc366b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 206,
+/**/
205,
/**/
204,