From: ben <ben@cda61777-01e9-0310-a592-d414129be87e>
Date: Sat, 19 Mar 2005 19:23:49 +0000 (+0000)
Subject: Revert last change: Some versions of the GNU C Library (notably SUSE
X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/commitdiff_plain/fe7b25bd679e28633d5ee757adb7fbd6b874608b

Revert last change: Some versions of the GNU C Library (notably SUSE
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.


git-svn-id: svn://svn.tartarus.org/sgt/putty@5529 cda61777-01e9-0310-a592-d414129be87e
---

diff --git a/unix/uxmisc.c b/unix/uxmisc.c
index 0b04d211..28ae83a2 100644
--- a/unix/uxmisc.c
+++ b/unix/uxmisc.c
@@ -4,27 +4,21 @@
 
 #include <stdio.h>
 #include <unistd.h>
-#include <time.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <pwd.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)
 {
     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);
+    /*
+     * 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;
 }