]> granicus.if.org Git - vim/commitdiff
updated for version 7.3.436 v7.3.436
authorBram Moolenaar <Bram@vim.org>
Sat, 11 Feb 2012 19:44:10 +0000 (20:44 +0100)
committerBram Moolenaar <Bram@vim.org>
Sat, 11 Feb 2012 19:44:10 +0000 (20:44 +0100)
Problem:    Compiler warnings for types on Windows.
Solution:   Add type casts. (Mike Williams)

src/eval.c
src/version.c

index bd2d14280edad1da0a00db295188aee12d4f19f7..848c6670d6f0870229fc81761c837a5207ff51fe 100644 (file)
@@ -14462,7 +14462,7 @@ f_readfile(argvars, rettv)
                            --prevlen;
                }
                if (prevlen == 0)
-                   s = vim_strnsave(start, len);
+                   s = vim_strnsave(start, (int)len);
                else
                {
                    /* Change "prev" buffer to be the right size.  This way
@@ -14529,7 +14529,7 @@ f_readfile(argvars, rettv)
 
                        if (dest < buf)
                        {
-                           adjust_prevlen = buf - dest; /* must be 1 or 2 */
+                           adjust_prevlen = (int)(buf - dest); /* must be 1 or 2 */
                            dest = buf;
                        }
                        if (readlen > p - buf + 1)
@@ -14558,11 +14558,11 @@ f_readfile(argvars, rettv)
                 * small, to avoid repeatedly 'allocing' large and
                 * 'reallocing' small. */
                if (prevsize == 0)
-                   prevsize = p - start;
+                   prevsize = (long)(p - start);
                else
                {
                    long grow50pc = (prevsize * 3) / 2;
-                   long growmin  = (p - start) * 2 + prevlen;
+                   long growmin  = (long)((p - start) * 2 + prevlen);
                    prevsize = grow50pc > growmin ? grow50pc : growmin;
                }
                if ((newprev = vim_realloc(prev, prevsize)) == NULL)
@@ -14575,7 +14575,7 @@ f_readfile(argvars, rettv)
            }
            /* Add the line part to end of "prev". */
            mch_memmove(prev + prevlen, start, p - start);
-           prevlen += p - start;
+           prevlen += (long)(p - start);
        }
     } /* while */
 
index a181505eee38cfd11d02adafe08ed5575370d6bc..2c7ad8fb6b2060c945a26bb7a74adcfb4a9acd40 100644 (file)
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    436,
 /**/
     435,
 /**/