From 1c8b4edb9b6cd5248925f3f06ec82486be9fb4ea Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 17 Mar 2016 21:51:03 +0100 Subject: patch 7.4.1587 Problem: Compiler warnings with 64 bit compiler. Solution: Add type casts. (Mike Williams) --- src/ex_cmds2.c | 4 ++-- src/version.c | 2 ++ 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 @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1587, /**/ 1586, /**/ -- cgit v1.2.3