Merge branch 'jk/push-deadlock-regression-fix' into maint

diff --git a/prio-queue.c b/prio-queue.c
index e4365b00d6c3366e6753fc6da3fe1a165ab1222d..17252d231b31f2b8d82d7160d7b95709e14779ff 100644 (file)
--- a/prio-queue.c
+++ b/prio-queue.c
@@ -12,9 +12,7 @@ static inline int compare(struct prio_queue *queue, int i, int j)
 
 static inline void swap(struct prio_queue *queue, int i, int j)
 {
-       struct prio_queue_entry tmp = queue->array[i];
-       queue->array[i] = queue->array[j];
-       queue->array[j] = tmp;
+       SWAP(queue->array[i], queue->array[j]);
 }
 
 void prio_queue_reverse(struct prio_queue *queue)