Merge branch 'nmathewson-timeout_cb_override'

03cbc38b · William Ahern · 8c2260a6 · 73686bec · 03cbc38b
Commit 03cbc38b authored Feb 24, 2016 by William Ahern
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

timeout.h timeout.h +2 -1

No files found.
--- a/timeout.h
+++ b/timeout.h
@@ -88,11 +88,12 @@ typedef uint64_t timeout_t;
 *
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

+#ifndef TIMEOUT_CB_OVERRIDE
 struct timeout_cb {
 	void (*fn)();
 	void *arg;
 }; /* struct timeout_cb */
-
+#endif

 /*
 * T I M E O U T  I N T E R F A C E S