lib: rename include dir to babeltrace2

[babeltrace.git] / lib / prio_heap / prio_heap.c

diff --git a/lib/prio_heap/prio_heap.c b/lib/prio_heap/prio_heap.c
index 8942a113aec50038fe20f59c6bbf84756a2d780d..97a69ac4b86293ee4b1d989948be23e5a45fd66c 100644 (file)
--- a/lib/prio_heap/prio_heap.c
+++ b/lib/prio_heap/prio_heap.c
@@ -1,6 +1,4 @@
 /*
- * prio_heap.c
- *
  * Static-sized priority heap containing pointers. Based on CLRS,
  * chapter 6.
  *
@@ -25,17 +23,12 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/prio_heap.h>
-#include <babeltrace/babeltrace-internal.h>
+#include <babeltrace2/prio-heap-internal.h>
+#include <babeltrace2/babeltrace-internal.h>
+#include <babeltrace2/assert-internal.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
-
-#ifndef max_t
-#define max_t(type, a, b)      \
-       ((type) (a) > (type) (b) ? (type) (a) : (type) (b))
-#endif
 
 #ifdef DEBUG_HEAP
 void check_heap(const struct ptr_heap *heap)
@@ -46,7 +39,7 @@ void check_heap(const struct ptr_heap *heap)
                return;
 
        for (i = 1; i < heap->len; i++)
-               assert(!heap->gt(heap->ptrs[i], heap->ptrs[0]));
+               BT_ASSERT(!heap->gt(heap->ptrs[i], heap->ptrs[0]));
 }
 #endif