Work around lcc's annoying (but, even more annoyingly, legitimate)

refusal to allow comparison of function pointers. Unfortunately this
still doesn't cause PuTTY to compile on my lcc installation, because
the GetCharacterPlacement stuff in exact_textout() is missing from
its header files. This may have been fixed in a future version (I'm
using lcc-win32 version 3.8 from December 2003), but I haven't
checked.

[originally from svn r5527]

diff --git a/timing.c b/timing.c
index a87be8975ed0a8b2959db3edb31213a90b755e20..6dd8aa5e689dd10fe59cbb7dab98beef86683692 100644 (file)
--- a/timing.c
+++ b/timing.c
@@ -41,10 +41,21 @@ 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__
+    /* 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;
+    }
+#else    
     if (a->fn < b->fn)
        return -1;
     else if (a->fn > b->fn)
        return +1;
+#endif
 
     if (a->ctx < b->ctx)
        return -1;