diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-11-17 10:00:41 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-11-17 10:00:41 -0500 |
| commit | 8af5afedc92cca81ec8132baa1ec7d801145d011 (patch) | |
| tree | 9abb42a166c770a0e472c8336db8dd85f2fbc2db /src/or/main.c | |
| parent | d3cb659541c7f5b0a0c9910e8f8c6b030c5f43f8 (diff) | |
| download | tor-8af5afedc92cca81ec8132baa1ec7d801145d011.tar.gz tor-8af5afedc92cca81ec8132baa1ec7d801145d011.zip | |
windows already has a CALLBACK macro...
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
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); |