git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare for post-2.2.0 (2.2.90).
[sliver-openvswitch.git]
/
lib
/
timer.h
diff --git
a/lib/timer.h
b/lib/timer.h
index
e9650ad
..
9afe3b7
100644
(file)
--- a/
lib/timer.h
+++ b/
lib/timer.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2011 Nicira, Inc.
+ * 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.
*
* 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 *);
};
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.
*
/* Causes 'timer' to expire when 'duration' milliseconds have passed.
*