Merge branch 'maint'

diff --git a/prio-queue.h b/prio-queue.h
index 9c3cd1f875ce553c2c10645c9b7df6b4287306f8..d030ec9dd6765447ad986a40945d1ed8bf9272a0 100644 (file)
--- a/prio-queue.h
+++ b/prio-queue.h
@@ -21,11 +21,17 @@
  */
 typedef int (*prio_queue_compare_fn)(const void *one, const void *two, void *cb_data);
 
+struct prio_queue_entry {
+       unsigned ctr;
+       void *data;
+};
+
 struct prio_queue {
        prio_queue_compare_fn compare;
+       unsigned insertion_ctr;
        void *cb_data;
        int alloc, nr;
-       void **array;
+       struct prio_queue_entry *array;
 };
 
 /*