summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-10-16 20:35:36 +0200
committerBram Moolenaar <Bram@vim.org>2014-10-16 20:35:36 +0200
commit861d80a671747e6535c83356bcffcf80a72f543b (patch)
tree4fa430796c14c70a10e7a16fd4ac58c2b03643e0 /src
parent799d6abf3ec600dbb92cdcd5c25985efea053c09 (diff)
downloadvim-861d80a671747e6535c83356bcffcf80a72f543b.zip
updated for version 7.4.481
Problem: Compiler warning on MS-Windows. Solution: Add type casts. (Ken Takata)
Diffstat (limited to 'src')
-rw-r--r--src/os_mswin.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/os_mswin.c b/src/os_mswin.c
index dfd40af8d..0dfd7d609 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -1644,10 +1644,11 @@ mch_print_init(prt_settings_T *psettings, char_u *jobname, int forceit)
char_u *to_free = NULL;
int maxlen;
- acp_to_enc(printer_name, STRLEN(printer_name), &to_free, &maxlen);
+ acp_to_enc(printer_name, (int)STRLEN(printer_name), &to_free,
+ &maxlen);
if (to_free != NULL)
printer_name = to_free;
- acp_to_enc(port_name, STRLEN(port_name), &to_free, &maxlen);
+ acp_to_enc(port_name, (int)STRLEN(port_name), &to_free, &maxlen);
if (to_free != NULL)
port_name = to_free;
}
diff --git a/src/version.c b/src/version.c
index 01fdef61c..7923a4d93 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 481,
+/**/
480,
/**/
479,