diff options
| author | watiko <service@mail.watiko.net> | 2016-02-13 13:21:44 +0900 |
|---|---|---|
| committer | watiko <service@mail.watiko.net> | 2016-02-21 22:06:39 +0900 |
| commit | 6bbd149e9812161a736863f68400ff394e649b5e (patch) | |
| tree | 3ac88414862b5d9c4ea16e1c4f6cb09451a7f5d5 | |
| parent | 6ea1047585664608cb42e007ba87ad86109ae3f8 (diff) | |
| download | rneovim-6bbd149e9812161a736863f68400ff394e649b5e.tar.gz rneovim-6bbd149e9812161a736863f68400ff394e649b5e.tar.bz2 rneovim-6bbd149e9812161a736863f68400ff394e649b5e.zip | |
vim-patch:7.4.845
Problem: Compiler warning for possible loss of data.
Solution: Add a type cast. (Erich Ritz)
https://github.com/vim/vim/commit/5df1ed2de3fa9dcace996b9a0a4c9b3cea79cf1e
| -rw-r--r-- | src/nvim/os/env.c | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c index ea0e992fe2..41ce8ddbc2 100644 --- a/src/nvim/os/env.c +++ b/src/nvim/os/env.c @@ -278,7 +278,7 @@ void expand_env_esc(char_u *srcp, char_u *dst, int dstlen, bool esc, bool one, } memcpy((char *)dst, (char *)var, len); dst += len; - dstlen -= len; + dstlen -= (int)len; continue; } copy_char = true; diff --git a/src/nvim/version.c b/src/nvim/version.c index 7f400773b0..a3ada277b7 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -445,7 +445,7 @@ static int included_patches[] = { 848, 847, // 846 NA - // 845, + 845, 844, 843, // 842 NA |