Merge remote-tracking branch 'origin/pr/180'

This commit is contained in:
Nick Mathewson 2014-11-30 19:25:21 -05:00
commit 23133cacc8

View File

@ -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. */