0
0
mirror of https://github.com/vim/vim.git synced 2025-07-04 23:07:33 -04:00

updated for version 7.3.436

Problem:    Compiler warnings for types on Windows.
Solution:   Add type casts. (Mike Williams)
This commit is contained in:
Bram Moolenaar 2012-02-11 20:44:10 +01:00
parent c047b9a49f
commit 68ba0dd633
2 changed files with 7 additions and 5 deletions

View File

@ -14462,7 +14462,7 @@ f_readfile(argvars, rettv)
--prevlen; --prevlen;
} }
if (prevlen == 0) if (prevlen == 0)
s = vim_strnsave(start, len); s = vim_strnsave(start, (int)len);
else else
{ {
/* Change "prev" buffer to be the right size. This way /* Change "prev" buffer to be the right size. This way
@ -14529,7 +14529,7 @@ f_readfile(argvars, rettv)
if (dest < buf) if (dest < buf)
{ {
adjust_prevlen = buf - dest; /* must be 1 or 2 */ adjust_prevlen = (int)(buf - dest); /* must be 1 or 2 */
dest = buf; dest = buf;
} }
if (readlen > p - buf + 1) if (readlen > p - buf + 1)
@ -14558,11 +14558,11 @@ f_readfile(argvars, rettv)
* small, to avoid repeatedly 'allocing' large and * small, to avoid repeatedly 'allocing' large and
* 'reallocing' small. */ * 'reallocing' small. */
if (prevsize == 0) if (prevsize == 0)
prevsize = p - start; prevsize = (long)(p - start);
else else
{ {
long grow50pc = (prevsize * 3) / 2; long grow50pc = (prevsize * 3) / 2;
long growmin = (p - start) * 2 + prevlen; long growmin = (long)((p - start) * 2 + prevlen);
prevsize = grow50pc > growmin ? grow50pc : growmin; prevsize = grow50pc > growmin ? grow50pc : growmin;
} }
if ((newprev = vim_realloc(prev, prevsize)) == NULL) if ((newprev = vim_realloc(prev, prevsize)) == NULL)
@ -14575,7 +14575,7 @@ f_readfile(argvars, rettv)
} }
/* Add the line part to end of "prev". */ /* Add the line part to end of "prev". */
mch_memmove(prev + prevlen, start, p - start); mch_memmove(prev + prevlen, start, p - start);
prevlen += p - start; prevlen += (long)(p - start);
} }
} /* while */ } /* while */

View File

@ -714,6 +714,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 */
/**/
436,
/**/ /**/
435, 435,
/**/ /**/