patch 7.4.1517

Problem:    Compiler warning with 64bit compiler.
Solution:   Add typecast. (Mike Williams)

diff --git a/src/channel.c b/src/channel.c
index e7c25ac3fa0a4e6536167ad947960cc1b1202f28..dec0c79be19b76c18abd96f0153bd9d13fd867fa 100644 (file)
--- 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 f39635e707c11aa5ede82b7b88568122996600df..8c82f67c3ea48116d0845e9d0781699aaedccd01 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1517,
 /**/
     1516,
 /**/