circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 13:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2020-06-02 11:29:48 +01:00
parent 191a836560 f3931497f8
commit 31a51cae1d
7 changed files with 223 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tmux.c
View File

@ -237,6 +237,20 @@ setblocking(int fd, int state)
}
}
uint64_t
get_timer(void)
{
struct timespec ts;
/*
* We want a timestamp in milliseconds suitable for time measurement,
* so prefer the monotonic clock.
*/
if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0)
clock_gettime(CLOCK_REALTIME, &ts);
return ((ts.tv_sec * 1000ULL) + (ts.tv_nsec / 1000000ULL));
}
const char *
sig2name(int signo)
{