From 9b8f021d93de3a2a2905d0e46b9f0b6dbb3e12f9 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 13 Aug 2014 22:05:53 +0200 Subject: updated for version 7.4.404 Problem: Windows 64 bit compiler warnings. Solution: Add type casts. (Mike Williams) --- src/crypt.c | 6 +++--- src/undo.c | 6 +++--- src/version.c | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/crypt.c b/src/crypt.c index 758ffb17b2..c54e15c4af 100644 --- a/src/crypt.c +++ b/src/crypt.c @@ -397,13 +397,13 @@ crypt_encode_alloc(state, from, len, newptr) 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; } /* diff --git a/src/undo.c b/src/undo.c index 8f50f0f0a8..db6ea29ab7 100644 --- 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; diff --git a/src/version.c b/src/version.c index b832539c0e..42369f1d6e 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 404, /**/ 403, /**/ -- cgit v1.2.3