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
index 19210f30bdd8dce23be444496cdd64b34b51513e..0a9895a35708e7e1c182e6fe43ea45a50ea3b917 100644 (file)
--- 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
index ec4f909fc1845e2b6e059f79e733fd1c79020f00..6e58e85e4037b8abd0416d6a5f76964e07b243b6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1587,
 /**/
     1586,
 /**/