summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-03-08 17:13:06 +0100
committerBram Moolenaar <Bram@vim.org>2016-03-08 17:13:06 +0100
commit367aabdbf76f7df00fd18e39d9378d1360a526ab (patch)
treef3c5d79a6a1a4ab38241e54e8637fedd8ff1acf3
parent8049253b96838b3584600e5ad229abad37a95b10 (diff)
downloadvim-git-367aabdbf76f7df00fd18e39d9378d1360a526ab.tar.gz
patch 7.4.1517v7.4.1517
Problem: Compiler warning with 64bit compiler. Solution: Add typecast. (Mike Williams)
-rw-r--r--src/channel.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/channel.c b/src/channel.c
index e7c25ac3f..dec0c79be 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -1005,7 +1005,7 @@ channel_set_req_callback(
write_buf_line(buf_T *buf, linenr_T lnum, channel_T *channel)
{
char_u *line = ml_get_buf(buf, lnum, FALSE);
- int len = STRLEN(line);
+ int len = (int)STRLEN(line);
char_u *p;
/* TODO: check if channel can be written to, do not block on write */
diff --git a/src/version.c b/src/version.c
index f39635e70..8c82f67c3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1517,
+/**/
1516,
/**/
1515,