summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-07-27 20:33:01 -0400
committerNick Mathewson <nickm@torproject.org>2017-07-27 20:33:01 -0400
commitbaf53300d731c1e047dca217b69bfa372f310d57 (patch)
treec379f89030d28f592b0f5c03d785c5bba832907c /src/common
parent15ed1c0c833ae30dd7560da3280cd8ca084ff566 (diff)
parentaf3079a492ef1611422f97c72fe07426931830d1 (diff)
downloadtor-baf53300d731c1e047dca217b69bfa372f310d57.tar.gz
tor-baf53300d731c1e047dca217b69bfa372f310d57.zip
Merge branch 'maint-0.3.1'
Diffstat (limited to 'src/common')
-rw-r--r--src/common/workqueue.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/workqueue.c b/src/common/workqueue.c
index d1303ee0e3..42723224d3 100644
--- a/src/common/workqueue.c
+++ b/src/common/workqueue.c
@@ -377,8 +377,8 @@ threadpool_queue_work_priority(threadpool_t *pool,
void (*reply_fn)(void *),
void *arg)
{
- tor_assert(prio >= WORKQUEUE_PRIORITY_FIRST &&
- prio <= WORKQUEUE_PRIORITY_LAST);
+ tor_assert(((int)prio) >= WORKQUEUE_PRIORITY_FIRST &&
+ ((int)prio) <= WORKQUEUE_PRIORITY_LAST);
workqueue_entry_t *ent = workqueue_entry_new(fn, reply_fn, arg);
ent->on_pool = pool;