diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-11-30 19:25:21 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-11-30 19:25:21 -0500 |
| commit | 23133cacc841e3e5b226de8b4ab39ad2eab68317 (patch) | |
| tree | 7c0556e1a801dc44e0b3219f6432c035f4247fde | |
| parent | c51c85d397c3838cdc81c7dd6a232f3551338ed8 (diff) | |
| parent | b361b8a65666bebe5302604f45f9cb95c62fb9fa (diff) | |
| download | libevent-23133cacc841e3e5b226de8b4ab39ad2eab68317.tar.gz | |
Merge remote-tracking branch 'origin/pr/180'
| -rw-r--r-- | include/event2/bufferevent.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/event2/bufferevent.h b/include/event2/bufferevent.h index a97030ef..fe8a74d3 100644 --- a/include/event2/bufferevent.h +++ b/include/event2/bufferevent.h @@ -599,7 +599,7 @@ enum bufferevent_trigger_options { BEV_TRIG_IGNORE_WATERMARKS = (1<<16), /** defer even if the callbacks are not */ - BEV_TRIG_DEFER_CALLBACKS = BEV_OPT_DEFER_CALLBACKS, + BEV_TRIG_DEFER_CALLBACKS = BEV_OPT_DEFER_CALLBACKS /* (Note: for internal reasons, these need to be disjoint from * bufferevent_options, except when they mean the same thing. */ |