From: Timo Sirainen <tss@iki.fi>
Date: Fri, 14 Feb 2003 10:45:34 +0000 (+0200)
Subject: Don't inline timeout_update_next(). gcc 3.2.2 with -O2 seems to break it.
X-Git-Tag: 1.1.alpha1~4935
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55804424c3000222029bb619232a755547a723d7;p=thirdparty%2Fdovecot%2Fcore.git

Don't inline timeout_update_next(). gcc 3.2.2 with -O2 seems to break it.

--HG--
branch : HEAD
---

diff --git a/src/lib/ioloop.c b/src/lib/ioloop.c
index d7604c4315..9526726e27 100644
--- a/src/lib/ioloop.c
+++ b/src/lib/ioloop.c
@@ -160,8 +160,7 @@ static void timeout_list_insert(struct ioloop *ioloop, struct timeout *timeout)
         *t = timeout;
 }
 
-inline static void
-timeout_update_next(struct timeout *timeout, struct timeval *tv_now)
+static void timeout_update_next(struct timeout *timeout, struct timeval *tv_now)
 {
         if (tv_now == NULL)
 		gettimeofday(&timeout->next_run, NULL);
@@ -172,8 +171,7 @@ timeout_update_next(struct timeout *timeout, struct timeval *tv_now)
 
 	/* we don't want microsecond accuracy or this function will be
 	   called all the time - millisecond is more than enough */
-	timeout->next_run.tv_usec /= 1000;
-	timeout->next_run.tv_usec *= 1000;
+	timeout->next_run.tv_usec -= timeout->next_run.tv_usec % 1000;
 
 	timeout->next_run.tv_sec += timeout->msecs/1000;
 	timeout->next_run.tv_usec += (timeout->msecs%1000)*1000;