From 1daae446e58fd90f98c51ff3af8f54bfa5197751 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 22 Feb 2016 23:25:25 +0100 Subject: [PATCH] patch 7.4.1396 Problem: Compiler warnings for conversions. Solution: Add type cast. --- src/ex_cmds2.c | 6 +++--- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index 9601409a7..e105fa00b 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -3087,8 +3087,8 @@ source_pack_plugin(char_u *fname, void *cookie UNUSED) if (strstr((char *)p_rtp, (char *)fname) == NULL) { /* directory not in 'runtimepath', add it */ - oldlen = STRLEN(p_rtp); - addlen = STRLEN(fname); + oldlen = (int)STRLEN(p_rtp); + addlen = (int)STRLEN(fname); new_rtp = alloc(oldlen + addlen + 2); if (new_rtp == NULL) { @@ -3130,7 +3130,7 @@ ex_loadplugin(exarg_T *eap) int len; char *pat; - len = STRLEN(pattern) + STRLEN(eap->arg); + len = (int)STRLEN(pattern) + (int)STRLEN(eap->arg); pat = (char *)alloc(len); if (pat == NULL) return; diff --git a/src/version.c b/src/version.c index d028ca54a..a476aaee5 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 */ +/**/ + 1396, /**/ 1395, /**/ -- 2.50.1