diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-03-05 08:23:32 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-03-05 08:23:32 -0500 |
| commit | 686494f0f71b9235399b8241aba3e0c2fcb03ea1 (patch) | |
| tree | 39256173e40ef50d45cc35c22561da9279f9753b /src/feature/control/control_events.h | |
| parent | edc0bf5089df13d1d6a246e67bddb484ac99ad59 (diff) | |
| parent | b5ccdd978ea138cde92b3513c9d653ba18b8b463 (diff) | |
| download | tor-686494f0f71b9235399b8241aba3e0c2fcb03ea1.tar.gz tor-686494f0f71b9235399b8241aba3e0c2fcb03ea1.zip | |
Merge branch 'clang_format_prep_3'
Diffstat (limited to 'src/feature/control/control_events.h')
| -rw-r--r-- | src/feature/control/control_events.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/feature/control/control_events.h b/src/feature/control/control_events.h index 4f960b2443..4a5492b510 100644 --- a/src/feature/control/control_events.h +++ b/src/feature/control/control_events.h @@ -12,6 +12,7 @@ #ifndef TOR_CONTROL_EVENTS_H #define TOR_CONTROL_EVENTS_H +#include "lib/cc/ctassert.h" #include "core/or/ocirc_event.h" #include "core/or/orconn_event.h" @@ -288,10 +289,7 @@ typedef uint64_t event_mask_t; /* If EVENT_MAX_ ever hits 0x0040, we need to make the mask into a * different structure, as it can only handle a maximum left shift of 1<<63. */ - -#if EVENT_MAX_ >= EVENT_CAPACITY_ -#error control_connection_t.event_mask has an event greater than its capacity -#endif +CTASSERT(EVENT_MAX_ < EVENT_CAPACITY_); #define EVENT_MASK_(e) (((uint64_t)1)<<(e)) |