changeset 6132:0242c27e40e1 v7.4.404

updated for version 7.4.404 Problem: Windows 64 bit compiler warnings. Solution: Add type casts. (Mike Williams)
author Bram Moolenaar <bram@vim.org>
date Wed, 13 Aug 2014 22:05:53 +0200
parents b201f6f99781
children 18fd959b07ef
files src/crypt.c src/undo.c src/version.c
diffstat 3 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/crypt.c
+++ b/src/crypt.c
@@ -397,13 +397,13 @@ crypt_encode_alloc(state, from, len, new
 	return method->encode_buffer_fn(state, from, len, newptr);
     if (len == 0)
 	/* Not buffering, just return EOF. */
-	return len;
+	return (long)len;
 
-    *newptr = alloc(len);
+    *newptr = alloc((long)len);
     if (*newptr == NULL)
 	return -1;
     method->encode_fn(state, from, len, *newptr);
-    return len;
+    return (long)len;
 }
 
 /*
--- a/src/undo.c
+++ b/src/undo.c
@@ -992,7 +992,7 @@ undo_write_bytes(bi, nr, len)
     int	    bufi = 0;
 
     for (i = len - 1; i >= 0; --i)
-	buf[bufi++] = nr >> (i * 8);
+	buf[bufi++] = (char_u)(nr >> (i * 8));
     return undo_write(bi, buf, (size_t)len);
 }
 
@@ -1093,7 +1093,7 @@ undo_read(bi, buffer, size)
 #ifdef FEAT_CRYPT
     if (bi->bi_buffer != NULL)
     {
-	int	size_todo = size;
+	int	size_todo = (int)size;
 	char_u	*p = buffer;
 
 	while (size_todo > 0)
@@ -1119,7 +1119,7 @@ undo_read(bi, buffer, size)
 		n = bi->bi_avail - bi->bi_used;
 	    mch_memmove(p, bi->bi_buffer + bi->bi_used, n);
 	    bi->bi_used += n;
-	    size_todo -= n;
+	    size_todo -= (int)n;
 	    p += n;
 	}
 	return OK;
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    404,
+/**/
     403,
 /**/
     402,