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 d7604c43154d91ce724ae09941994677a02aea79..9526726e277b5ed2b694f5d6726adf1ab0a79076 100644 (file)
--- 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;