windows already has a CALLBACK macro...

diff --git a/src/or/main.c b/src/or/main.c
index db6d7263062bc5f23d4001bb8a2f628ebcb2da41..0b8591f1d4d16bf78e8e1c168107c8eab127fcec 100644 (file)
--- 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);