# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1458248404 -3600
# Node ID 887b378f29d11fcb25a916ff8ea3177c1b45eef3
# Parent  f5836ba956b12dbdda28959cbd9a07f802ed62a2
commit https://github.com/vim/vim/commit/1c8b4edb9b6cd5248925f3f06ec82486be9fb4ea
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Mar 17 21:51:03 2016 +0100

    patch 7.4.1587
    Problem:    Compiler warnings with 64 bit compiler.
    Solution:   Add type casts. (Mike Williams)

diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -3272,7 +3272,7 @@ do_in_runtimepath(
 
     if ((done == FAIL || (flags & DIP_ALL)) && (flags & DIP_START))
     {
-	len = STRLEN(start_dir) + STRLEN(name);
+	len = (int)(STRLEN(start_dir) + STRLEN(name));
 	s = alloc(len);
 	if (s == NULL)
 	    return FAIL;
@@ -3283,7 +3283,7 @@ do_in_runtimepath(
 
     if ((done == FAIL || (flags & DIP_ALL)) && (flags & DIP_OPT))
     {
-	len = STRLEN(opt_dir) + STRLEN(name);
+	len = (int)(STRLEN(opt_dir) + STRLEN(name));
 	s = alloc(len);
 	if (s == NULL)
 	    return FAIL;
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1587,
+/**/
     1586,
 /**/
     1585,