nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 09:58:01 +00:00
Code Issues Projects Releases Wiki Activity

Revert last change: Some versions of the GNU C Library (notably SUSE

Browse Source 
glibc-2.3.3-118 and Debian libc6 2.3.2.ds1-20) have clock_gettime() and
CLOCK_MONOTONIC in their headers, but not in libc itself, which we can't
detect easily.

[originally from svn r5529]
This commit is contained in:
Ben Harris 2005-03-19 19:23:49 +00:00
parent f812865ceb
commit 616f220472
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
unix/uxmisc.c
View File

@ -4,27 +4,21 @@
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <time.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <pwd.h> #include <pwd.h>
#include "putty.h" #include "putty.h"
/*
* We want to use milliseconds rather than microseconds or nanoseconds,
* because we need a decent number of them to fit into a 32-bit
* word so it can be used for keepalives.
*/
unsigned long getticks(void) unsigned long getticks(void)
{ {
struct timeval tv; struct timeval tv;
#ifdef CLOCK_MONOTONIC
struct timespec ts;
if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0)
return ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
#endif
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
/*
* We want to use milliseconds rather than microseconds,
* because we need a decent number of them to fit into a 32-bit
* word so it can be used for keepalives.
*/
return tv.tv_sec * 1000 + tv.tv_usec / 1000; return tv.tv_sec * 1000 + tv.tv_usec / 1000;
} }