diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-12-01 11:56:56 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-12-01 11:56:56 -0500 |
| commit | f4656498a818793256b99721dadbed6ebde65793 (patch) | |
| tree | 3e56ec47640cfe6541012a78908e2982ab18b66f /src | |
| parent | 826f474ef06e8a406fa398e7ee461457f26a0e8e (diff) | |
| parent | 1968f4898a29c686e36c70505d485e63f9862f2c (diff) | |
| download | rneovim-f4656498a818793256b99721dadbed6ebde65793.tar.gz rneovim-f4656498a818793256b99721dadbed6ebde65793.tar.bz2 rneovim-f4656498a818793256b99721dadbed6ebde65793.zip | |
Merge pull request #3762 from Shougo/vim-7.4.649
vim-patch:7.4.649
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/misc2.c | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/misc2.c b/src/nvim/misc2.c index c615e0689f..3c0a1414a6 100644 --- a/src/nvim/misc2.c +++ b/src/nvim/misc2.c @@ -470,7 +470,7 @@ void put_time(FILE *fd, time_t time_) { uint8_t buf[8]; time_to_bytes(time_, buf); - fwrite(buf, sizeof(uint8_t), ARRAY_SIZE(buf), fd); + (void)fwrite(buf, sizeof(uint8_t), ARRAY_SIZE(buf), fd); } /// Writes time_t to "buf[8]". diff --git a/src/nvim/version.c b/src/nvim/version.c index c9a779b5c8..83a47c207d 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -347,7 +347,7 @@ static int included_patches[] = { // 652 NA 651, // 650 NA - // 649, + 649, // 648 NA // 647 NA 646, |