diff options
| author | Bram Moolenaar <bram@vim.org> | 2014-08-13 22:05:53 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2014-08-13 22:05:53 +0200 |
| commit | 4449bad5ccf6a2dc480ad3b1a8e13023b138b174 (patch) | |
| tree | 88cc05f7dec1b76e9391e4f54dfbbcd68e7ee349 | |
| parent | ce8d241ae81f86c7502d070269fa3ff94ee2819d (diff) | |
| download | vim-4449bad5ccf6a2dc480ad3b1a8e13023b138b174.tar.gz | |
Problem: Windows 64 bit compiler warnings.
Solution: Add type casts. (Mike Williams)
| -rw-r--r-- | src/crypt.c | 6 | ||||
| -rw-r--r-- | src/undo.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/crypt.c b/src/crypt.c index 758ffb17..c54e15c4 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; } /* @@ -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 b832539c..42369f1d 100644 --- 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, |