X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/c2eb6cb7db654cc38c996be9c72f0e06e93b1c98..88ea89339783ee587180b645981967f6cb8bcd20:/timing.c

diff --git a/timing.c b/timing.c
index 841d973b..ccd76cd6 100644
--- a/timing.c
+++ b/timing.c
@@ -36,13 +36,13 @@
 struct timer {
     timer_fn_t fn;
     void *ctx;
-    long now;
-    long when_set;
+    unsigned long now;
+    unsigned long when_set;
 };
 
 static tree234 *timers = NULL;
 static tree234 *timer_contexts = NULL;
-static long now = 0L;
+static unsigned long now = 0L;
 
 static int compare_timers(void *av, void *bv)
 {
@@ -60,14 +60,12 @@ static int compare_timers(void *av, void *bv)
      * Failing that, compare on the other two fields, just so that
      * we don't get unwanted equality.
      */
-#ifdef __LCC__
+#if defined(__LCC__) || defined(__clang__)
     /* lcc won't let us compare function pointers. Legal, but annoying. */
     {
 	int c = memcmp(&a->fn, &b->fn, sizeof(a->fn));
-	if (c < 0)
-	    return -1;
-	else if (c > 0)
-	    return +1;
+	if (c)
+	    return c;
     }
 #else    
     if (a->fn < b->fn)
@@ -108,9 +106,9 @@ static void init_timers(void)
     }
 }
 
-long schedule_timer(int ticks, timer_fn_t fn, void *ctx)
+unsigned long schedule_timer(int ticks, timer_fn_t fn, void *ctx)
 {
-    long when;
+    unsigned long when;
     struct timer *t, *first;
 
     init_timers();
@@ -155,7 +153,7 @@ long schedule_timer(int ticks, timer_fn_t fn, void *ctx)
  * Returns the time (in ticks) expected until the next timer after
  * that triggers.
  */
-int run_timers(long anow, long *next)
+int run_timers(unsigned long anow, unsigned long *next)
 {
     struct timer *first;
 
@@ -176,8 +174,8 @@ int run_timers(long anow, long *next)
 	     */
 	    delpos234(timers, 0);
 	    sfree(first);
-	} else if (first->now - now <= 0 ||
-	           now - (first->when_set - 10) < 0) {
+	} else if (now - (first->when_set - 10) >
+		   first->now - (first->when_set - 10)) {
 	    /*
 	     * This timer is active and has reached its running
 	     * time. Run it.