Merge branch 'maint-0.3.1'

This commit is contained in:
Nick Mathewson 2017-07-27 20:33:01 -04:00
commit baf53300d7

View File

@ -377,8 +377,8 @@ threadpool_queue_work_priority(threadpool_t *pool,
void (*reply_fn)(void *), void (*reply_fn)(void *),
void *arg) void *arg)
{ {
tor_assert(prio >= WORKQUEUE_PRIORITY_FIRST && tor_assert(((int)prio) >= WORKQUEUE_PRIORITY_FIRST &&
prio <= WORKQUEUE_PRIORITY_LAST); ((int)prio) <= WORKQUEUE_PRIORITY_LAST);
workqueue_entry_t *ent = workqueue_entry_new(fn, reply_fn, arg); workqueue_entry_t *ent = workqueue_entry_new(fn, reply_fn, arg);
ent->on_pool = pool; ent->on_pool = pool;