X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Ftimer.h;h=9afe3b75e48d7d0d3938e24c87cfa78432cc79fa;hb=c5cf10598f8c9f4428291e9df3ecd72a05fb1ccf;hp=be7bce2f4b9085eedf64837d8c2fa9b35ffe81fe;hpb=e9e3173ffc23abe8f5a70cc4366331218ca96302;p=sliver-openvswitch.git

diff --git a/lib/timer.h b/lib/timer.h
index be7bce2f4..9afe3b75e 100644
--- a/lib/timer.h
+++ b/lib/timer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Nicira Networks.
+ * Copyright (c) 2011, 2013 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,8 +27,8 @@ struct timer {
 };
 
 long long int timer_msecs_until_expired(const struct timer *);
-void timer_wait(const struct timer *, const char *where);
-#define timer_wait(timer) timer_wait(timer, SOURCE_LOCATOR)
+void timer_wait_at(const struct timer *, const char *where);
+#define timer_wait(timer) timer_wait_at(timer, SOURCE_LOCATOR)
 
 /* Causes 'timer' to expire when 'duration' milliseconds have passed.
  *