From 5665856b96f22067b8b8b4ddd9adcc06e05165d3 Mon Sep 17 00:00:00 2001 From: "brendan%mozilla.org" Date: Wed, 1 May 2002 23:35:46 +0000 Subject: [PATCH] Followup fix for 138791, neil@parkwaycc.co.uk's superior bit-fu (r=rjesup, sr=waterson, a=asa). git-svn-id: svn://10.0.0.236/trunk@120488 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/threads/nsTimerImpl.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/mozilla/xpcom/threads/nsTimerImpl.h b/mozilla/xpcom/threads/nsTimerImpl.h index e20efda4c4b..0d0c9461c05 100644 --- a/mozilla/xpcom/threads/nsTimerImpl.h +++ b/mozilla/xpcom/threads/nsTimerImpl.h @@ -79,14 +79,8 @@ enum { // Maximum possible delay (XXX rework to use ms rather than interval ticks). #define DELAY_INTERVAL_MAX (DELAY_INTERVAL_LIMIT - 1) -// Is interval-time t1 less than t2, even if t1 has wrapped PRIntervalTime? -static inline PRBool -TIMER_LESS_THAN(PRIntervalTime t, PRIntervalTime u) -{ - return (t < u) - ? u - t < DELAY_INTERVAL_LIMIT - : t - u > DELAY_INTERVAL_LIMIT; -} +// Is interval-time t less than u, even if t has wrapped PRIntervalTime? +#define TIMER_LESS_THAN(t, u) ((t) - (u) > DELAY_INTERVAL_LIMIT) class nsTimerImpl : public nsITimer, public nsIScriptableTimer {