diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-05-31 21:37:36 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-05-31 21:37:36 +0200 |
| commit | b055066a1daf12c349d6c575aff22ae4d999a157 (patch) | |
| tree | b1a1c54ba96a50abc70ccb5bca0b1279aa81b502 | |
| parent | e3188e261569ae512fb1ae2653b57fdd9e259ca3 (diff) | |
patch 7.4.1861v7.4.1861
Problem: Compiler warnings with 64 bit compiler.
Solution: Change int to size_t. (Mike William)
| -rw-r--r-- | src/ex_cmds2.c | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index 9adaea357d..5efe0ec15a 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -3343,10 +3343,10 @@ add_pack_plugin(char_u *fname, void *cookie) int c; char_u *new_rtp; int keep; - int oldlen; - int addlen; + size_t oldlen; + size_t addlen; char_u *afterdir; - int afterlen = 0; + size_t afterlen = 0; char_u *ffname = fix_fname(fname); if (ffname == NULL) @@ -3386,9 +3386,9 @@ add_pack_plugin(char_u *fname, void *cookie) if (afterdir != NULL && mch_isdir(afterdir)) afterlen = STRLEN(afterdir) + 1; /* add one for comma */ - oldlen = (int)STRLEN(p_rtp); - addlen = (int)STRLEN(ffname) + 1; /* add one for comma */ - new_rtp = alloc(oldlen + addlen + afterlen + 1); /* add one for NUL */ + oldlen = STRLEN(p_rtp); + addlen = STRLEN(ffname) + 1; /* add one for comma */ + new_rtp = alloc((int)(oldlen + addlen + afterlen + 1)); /* add one for NUL */ if (new_rtp == NULL) goto theend; keep = (int)(insp - p_rtp); diff --git a/src/version.c b/src/version.c index 515f518762..bf77c87e95 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1861, +/**/ 1860, /**/ 1859, |