diff options
Diffstat (limited to 'security/putty/patches/patch-timing.c')
| -rw-r--r-- | security/putty/patches/patch-timing.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/security/putty/patches/patch-timing.c b/security/putty/patches/patch-timing.c index 36d0925334f..c7885b77f20 100644 --- a/security/putty/patches/patch-timing.c +++ b/security/putty/patches/patch-timing.c @@ -1,19 +1,17 @@ -$NetBSD: patch-timing.c,v 1.1 2012/11/01 19:32:44 joerg Exp $ +$NetBSD: patch-timing.c,v 1.1.6.1 2013/08/21 19:40:13 tron Exp $ ---- timing.c.orig 2012-10-30 22:23:57.000000000 +0000 +--- timing.c.orig 2012-09-19 22:12:00.000000000 +0000 +++ timing.c -@@ -41,21 +41,10 @@ static int compare_timers(void *av, void +@@ -60,19 +60,10 @@ static int compare_timers(void *av, void * 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) |