Merge branch 'timeout_cb_override' of git://github.com/nmathewson/timeout into...

Merge branch 'timeout_cb_override' of git://github.com/nmathewson/timeout into nmathewson-timeout_cb_override

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