Merge pull request #4793 from brcolow/vim-7.4.1061

vim-patch:7.4.1061
This commit is contained in:
Justin M. Keyes
2016-05-22 12:21:41 -04:00
2 changed files with 4 additions and 3 deletions

View File

@@ -467,11 +467,12 @@ bool put_bytes(FILE *fd, uintmax_t number, size_t len)
} }
/// Writes time_t to file "fd" in 8 bytes. /// 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]; uint8_t buf[8];
time_to_bytes(time_, buf); 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]". /// Writes time_t to "buf[8]".

View File

@@ -623,7 +623,7 @@ static int included_patches[] = {
// 1064, // 1064,
// 1063 NA // 1063 NA
// 1062 NA // 1062 NA
// 1061, 1061,
// 1060 NA // 1060 NA
1059, 1059,
// 1058, // 1058,