aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 7.4.1861

Browse Source 
Problem:    Compiler warnings with 64 bit compiler.
Solution:   Change int to size_t. (Mike William)
This commit is contained in:
Bram Moolenaar
2016-05-31 21:37:36 +02:00
parent e3188e2615
commit b055066a1d
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ex_cmds2.c
View File

@@ -3343,10 +3343,10 @@ add_pack_plugin(char_u *fname, void *cookie)
int c; int c;
char_u *new_rtp; char_u *new_rtp;
int keep; int keep;
int oldlen; size_t oldlen;
int addlen; size_t addlen;
char_u *afterdir; char_u *afterdir;
int afterlen = 0; size_t afterlen = 0;
char_u *ffname = fix_fname(fname); char_u *ffname = fix_fname(fname);
if (ffname == NULL) if (ffname == NULL)
@@ -3386,9 +3386,9 @@ add_pack_plugin(char_u *fname, void *cookie)
if (afterdir != NULL && mch_isdir(afterdir)) if (afterdir != NULL && mch_isdir(afterdir))
afterlen = STRLEN(afterdir) + 1; /* add one for comma */ afterlen = STRLEN(afterdir) + 1; /* add one for comma */
oldlen = (int)STRLEN(p_rtp); oldlen = STRLEN(p_rtp);
addlen = (int)STRLEN(ffname) + 1; /* add one for comma */ addlen = STRLEN(ffname) + 1; /* add one for comma */
new_rtp = alloc(oldlen + addlen + afterlen + 1); /* add one for NUL */ new_rtp = alloc((int)(oldlen + addlen + afterlen + 1)); /* add one for NUL */
if (new_rtp == NULL) if (new_rtp == NULL)
goto theend; goto theend;
keep = (int)(insp - p_rtp); keep = (int)(insp - p_rtp);

2
src/version.c
View File

@@ -753,6 +753,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1861,
/**/ /**/
1860, 1860,
/**/ /**/