diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-02-22 23:25:25 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-02-22 23:25:25 +0100 |
commit | 1daae446e58fd90f98c51ff3af8f54bfa5197751 (patch) | |
tree | 600fb0cd04048afbf74cbbd3b7ec4ee6b7a0fd11 | |
parent | eed284a16977ab81fa6da8c9562990ba498acd8c (diff) | |
download | vim-git-1daae446e58fd90f98c51ff3af8f54bfa5197751.tar.gz |
patch 7.4.1396v7.4.1396
Problem: Compiler warnings for conversions.
Solution: Add type cast.
-rw-r--r-- | src/ex_cmds2.c | 6 | ||||
-rw-r--r-- | 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 @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1396, +/**/ 1395, /**/ 1394, |