build fixes

[disorder] / lib / heap.h

diff --git a/lib/heap.h b/lib/heap.h
index 4603942ff46d2766eff6f5735fd9274eb0dd3467..ebd2f60b2468f182e3878c05eaf3b3155dbb9c8b 100644 (file)
--- a/lib/heap.h
+++ b/lib/heap.h
@@ -76,20 +76,27 @@
  * \f$N\f$ and \f$A\f$ are exchanged, so now \f$A\f$ has children \f$N\f$ and
  * \f$B\f$.  \f$A < N\f$ and \f$A \le B\f$.
  */
-#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) {   \
     int n = heap->nvec;                                         \
     NAME##_append(heap, elt);                                   \
     while(n > 0) {                                              \
@@ -97,7 +104,7 @@
       if(!LT(heap->vec[n],heap->vec[p]))                        \
         break;                                                  \
       else {                                                    \
-        const NAME##_element t = heap->vec[n];                    \
+        const NAME##_element t = heap->vec[n];                  \
         heap->vec[n] = heap->vec[p];                            \
         heap->vec[p] = t;                                       \
         n = p;                                                  \
@@ -105,7 +112,7 @@
     }                                                           \
   }                                                             \
                                                                 \
-  static NAME##_element NAME##_remove(struct NAME *heap) {             \
+  NAME##_element NAME##_remove(struct NAME *heap) {             \
     int n = 0;                                                  \
     NAME##_element r;                                           \
                                                                 \
@@ -125,13 +132,13 @@
         heap->vec[n] = heap->vec[a];                            \
         heap->vec[a] = t;                                       \
         n = a;                                                  \
-      } else \
+      } else                                                    \
         break;                                                  \
     }                                                           \
     return r;                                                   \
   }                                                             \
                                                                 \
-  struct heap_swallow_semicolon
+  struct heap_swallow_semicolon                                 \
   
 
 #endif /* PQUEUE_H */