-#define HEAP_TYPE(NAME, ETYPE, LT) \
- typedef ETYPE NAME##_element; \
- VECTOR_TYPE(NAME, NAME##_element, xrealloc) \
- \
- static inline int NAME##_count(struct NAME *heap) { \
- return heap->nvec; \
- } \
- \
- static inline NAME##_element NAME##_first(struct NAME *heap) { \
- assert(heap->nvec > 0); \
- return heap->vec[0]; \
- } \
- \
- static void NAME##_insert(struct NAME *heap, NAME##_element elt) { \
+#define HEAP_TYPE(NAME, ETYPE, LT) \
+ typedef ETYPE NAME##_element; \
+ VECTOR_TYPE(NAME, NAME##_element, xrealloc); \
+ \
+ static inline int NAME##_count(struct NAME *heap) { \
+ return heap->nvec; \
+ } \
+ \
+ static inline NAME##_element NAME##_first(struct NAME *heap) { \
+ assert(heap->nvec > 0); \
+ return heap->vec[0]; \
+ } \
+ \
+ void NAME##_insert(struct NAME *heap, NAME##_element elt); \
+ NAME##_element NAME##_remove(struct NAME *heap); \
+ \
+ struct heap_swallow_semicolon
+
+/** @brief External-linkage definitions for @ref HEAP_TYPE */
+#define HEAP_DEFINE(NAME, ETYPE, LT) \
+ void NAME##_insert(struct NAME *heap, NAME##_element elt) { \