diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-10-22 09:39:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-10-22 09:39:06 -0400 |
| commit | b2d487ae2249a307cd23255dbb1a22241eefd6ef (patch) | |
| tree | cd754fbe8d1c13264749f997f1221b1635a97e49 /src/feature/control/control_events.c | |
| parent | 2d013bbe5cccaccf9ace0beec5a987fb80e850ad (diff) | |
| parent | 7e7a4874b8fa333d1840cc5f2c0b118d6a0e7c47 (diff) | |
| download | tor-b2d487ae2249a307cd23255dbb1a22241eefd6ef.tar.gz tor-b2d487ae2249a307cd23255dbb1a22241eefd6ef.zip | |
Merge branch 'ticket31705_v2' into ticket31705_v2_merged
Conflicts:
src/feature/dirparse/authcert_parse.c
src/feature/dirparse/ns_parse.c
src/feature/hs/hs_service.c
src/lib/conf/conftesting.h
src/lib/log/log.h
src/lib/thread/threads.h
src/test/test_options.c
These conflicts were mostly related to autostyle improvements, with
one or two due to doxygen fixes.
Diffstat (limited to 'src/feature/control/control_events.c')
| -rw-r--r-- | src/feature/control/control_events.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c index 00659c0477..b8a46c306f 100644 --- a/src/feature/control/control_events.c +++ b/src/feature/control/control_events.c @@ -1663,6 +1663,7 @@ control_event_status(int type, int severity, const char *format, va_list args) return 0; } +#ifndef COCCI #define CONTROL_EVENT_STATUS_BODY(event, sev) \ int r; \ do { \ @@ -1674,6 +1675,7 @@ control_event_status(int type, int severity, const char *format, va_list args) r = control_event_status((event), (sev), format, ap); \ va_end(ap); \ } while (0) +#endif /** Format and send an EVENT_STATUS_GENERAL event whose main text is obtained * by formatting the arguments using the printf-style <b>format</b>. */ |