diff options
Diffstat (limited to 'src/nvim/os')
| -rw-r--r-- | src/nvim/os/pty_process_unix.c | 10 | ||||
| -rw-r--r-- | src/nvim/os/time.c | 6 |
2 files changed, 3 insertions, 13 deletions
diff --git a/src/nvim/os/pty_process_unix.c b/src/nvim/os/pty_process_unix.c index 97545a6cb1..5fdf0e6181 100644 --- a/src/nvim/os/pty_process_unix.c +++ b/src/nvim/os/pty_process_unix.c @@ -36,11 +36,6 @@ # include "os/pty_process_unix.c.generated.h" #endif -/// Externally defined with gcov. -#ifdef USE_GCOV -void __gcov_flush(void); -#endif - /// termios saved at startup (for TUI) or initialized by pty_process_spawn(). static struct termios termios_default; @@ -64,11 +59,6 @@ int pty_process_spawn(PtyProcess *ptyproc) init_termios(&termios_default); } -#ifdef USE_GCOV - // Flush coverage data before forking, to avoid "Merge mismatch" errors. - __gcov_flush(); -#endif - int status = 0; // zero or negative error code (libuv convention) Process *proc = (Process *)ptyproc; assert(proc->err.closed); diff --git a/src/nvim/os/time.c b/src/nvim/os/time.c index 18239c5566..1094fbc946 100644 --- a/src/nvim/os/time.c +++ b/src/nvim/os/time.c @@ -39,7 +39,7 @@ void time_init(void) /// @see gettimeofday(2) /// /// @return Current time in microseconds. -uint64_t os_utime(void) +int64_t os_utime(void) FUNC_ATTR_WARN_UNUSED_RESULT { uv_timeval64_t tm; @@ -47,8 +47,8 @@ uint64_t os_utime(void) if (e != 0 || tm.tv_sec < 0 || tm.tv_usec < 0) { return 0; } - uint64_t rv = (uint64_t)tm.tv_sec * 1000 * 1000; // s => μs - STRICT_ADD(rv, tm.tv_usec, &rv, uint64_t); + int64_t rv = tm.tv_sec * 1000 * 1000; // s => μs + STRICT_ADD(rv, tm.tv_usec, &rv, int64_t); return rv; } |