From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 17 Nov 2015 15:00:41 +0000 (-0500)
Subject: windows already has a CALLBACK macro...
X-Git-Tag: tor-0.2.8.1-alpha~234
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8af5afedc92cca81ec8132baa1ec7d801145d011;p=thirdparty%2Ftor.git

windows already has a CALLBACK macro...
---

diff --git a/src/or/main.c b/src/or/main.c
index db6d726306..0b8591f1d4 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);