diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-05-22 12:21:41 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-05-22 12:21:41 -0400 |
| commit | c3ebfff18b334d5e49acc1ec09f123377348f518 (patch) | |
| tree | 083ef7012d2f08a1c157e7677f8f322d9a4025cc /src | |
| parent | 46a080015ff83aaf74e26b4517a6620815cfa078 (diff) | |
| parent | 620806ec0758d9292c6a205ec5f3a90ba133a199 (diff) | |
| download | rneovim-c3ebfff18b334d5e49acc1ec09f123377348f518.tar.gz rneovim-c3ebfff18b334d5e49acc1ec09f123377348f518.tar.bz2 rneovim-c3ebfff18b334d5e49acc1ec09f123377348f518.zip | |
Merge pull request #4793 from brcolow/vim-7.4.1061
vim-patch:7.4.1061
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/misc2.c | 5 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/misc2.c b/src/nvim/misc2.c index 4b64de1be0..368f83cfb5 100644 --- a/src/nvim/misc2.c +++ b/src/nvim/misc2.c @@ -467,11 +467,12 @@ bool put_bytes(FILE *fd, uintmax_t number, size_t len) } /// Writes time_t to file "fd" in 8 bytes. -void put_time(FILE *fd, time_t time_) +/// @returns FAIL when the write failed. +int put_time(FILE *fd, time_t time_) { uint8_t buf[8]; time_to_bytes(time_, buf); - (void)fwrite(buf, sizeof(uint8_t), ARRAY_SIZE(buf), fd); + return fwrite(buf, sizeof(uint8_t), ARRAY_SIZE(buf), fd) == 1 ? OK : FAIL; } /// Writes time_t to "buf[8]". diff --git a/src/nvim/version.c b/src/nvim/version.c index fce2896ddf..b713285c61 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -623,7 +623,7 @@ static int included_patches[] = { // 1064, // 1063 NA // 1062 NA - // 1061, + 1061, // 1060 NA 1059, // 1058, |