diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-12-06 20:39:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-06 20:39:53 -0500 |
| commit | 7477703586af3710584888b197d84a0938a27fe9 (patch) | |
| tree | a2b17e49945fcdb5879e79a5d46bd27e326659ca /src/nvim/log.c | |
| parent | 5855a3ea7bf19fdf8d1c0351ce062386fb98127a (diff) | |
| parent | 8ae34ab7802763c2bbf64c8ba99c36d159da7220 (diff) | |
| download | rneovim-7477703586af3710584888b197d84a0938a27fe9.tar.gz rneovim-7477703586af3710584888b197d84a0938a27fe9.tar.bz2 rneovim-7477703586af3710584888b197d84a0938a27fe9.zip | |
Merge pull request #13468 from janlazo/vim-8.1.0818
vim-patch:8.1.{818,1131,2064},8.2.{587,879,1021,1296,2104}
Diffstat (limited to 'src/nvim/log.c')
| -rw-r--r-- | src/nvim/log.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/nvim/log.c b/src/nvim/log.c index 225e40cdb4..19203a3c2a 100644 --- a/src/nvim/log.c +++ b/src/nvim/log.c @@ -13,9 +13,6 @@ #include <stdarg.h> #include <stdbool.h> #include <stdio.h> -#if !defined(WIN32) -# include <sys/time.h> // for gettimeofday() -#endif #include <uv.h> #include "auto/config.h" @@ -296,12 +293,10 @@ static bool v_do_log_to_file(FILE *log_file, int log_level, } int millis = 0; -#if !defined(WIN32) - struct timeval curtime; - if (gettimeofday(&curtime, NULL) == 0) { + uv_timeval64_t curtime; + if (uv_gettimeofday(&curtime) == 0) { millis = (int)curtime.tv_usec / 1000; } -#endif // Print the log message. int64_t pid = os_get_pid(); |