commit 8af5afedc92cca81ec8132baa1ec7d801145d011 Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 17 10:00:41 2015 -0500

windows already has a CALLBACK macro... --- src/or/main.c | 1 + 1 file changed, 1 insertion(+)

diff --git a/src/or/main.c b/src/or/main.c index db6d726..0b8591f 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1233,6 +1233,7 @@ get_signewnym_epoch(void) static int periodic_events_initialized = 0;

/* Declare all the timer callback functions... */ +#undef CALLBACK #define CALLBACK(name) \ static int name ## _callback(time_t, const or_options_t *) CALLBACK(rotate_onion_key);