X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Ftimer.c;h=e767db65ff97ff2aff23f45c5d0e1d22afa2e070;hb=a32f0904a7ed4b9cdc05165920d33cfe45349933;hp=b640a7be89f0bb2ca1dbf4cf5cd3d2dff4f3ade0;hpb=8650b075065d03db50dac26f33bb0ec3c485d044;p=openvswitch diff --git a/lib/timer.c b/lib/timer.c index b640a7be..e767db65 100644 --- a/lib/timer.c +++ b/lib/timer.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Nicira Networks. + * Copyright (c) 2011 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,9 +34,9 @@ timer_msecs_until_expired(const struct timer *timer) /* Causes poll_block() to wake when 'timer' expires. */ void -timer_wait(const struct timer *timer) +(timer_wait)(const struct timer *timer, const char *where) { if (timer->t < LLONG_MAX) { - poll_timer_wait_until(timer->t); + (poll_timer_wait_until)(timer->t, where); } }