summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-03-17 21:51:03 +0100
committerBram Moolenaar <Bram@vim.org>2016-03-17 21:51:03 +0100
commit1c8b4edb9b6cd5248925f3f06ec82486be9fb4ea (patch)
tree25cd006e79b3f1b7307608e7c239ecf3399f9c21
parent8a1bb046378f4bc68d6a04af2eab80fb3ce04da6 (diff)
patch 7.4.1587v7.4.1587
Problem: Compiler warnings with 64 bit compiler. Solution: Add type casts. (Mike Williams)
-rw-r--r--src/ex_cmds2.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 19210f30bd..0a9895a357 100644
--- 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 ec4f909fc1..6e58e85e40 100644
--- 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,