extractMax: use a C99 bool return type instead of boolean

diff --git a/lib/neatogen/closest.c b/lib/neatogen/closest.c
index d132751f616b4c42113c9094e13b84be2c8d8ed2..f104dca440d7d28675951dc4292679af35782fb8 100644 (file)
--- a/lib/neatogen/closest.c
+++ b/lib/neatogen/closest.c
@@ -11,6 +11,7 @@
 
 #include <neatogen/kkutils.h>
 #include <neatogen/closest.h>
+#include <stdbool.h>
 #include <stdlib.h>
 
 /*****************************************
@@ -138,16 +139,16 @@ static void initHeap(PairHeap * h, double *place, int *ordering, int n)
     }
 }
 
-static boolean extractMax(PairHeap * h, Pair * max)
+static bool extractMax(PairHeap * h, Pair * max)
 {
     if (h->heapSize == 0)
-       return FALSE;
+       return false;
 
     *max = h->data[0];
     h->data[0] = h->data[h->heapSize - 1];
     h->heapSize--;
     heapify(h, 0);
-    return TRUE;
+    return true;
 }
 
 static void insert(PairHeap * h, Pair edge)

diff --git a/lib/neatogen/dijkstra.c b/lib/neatogen/dijkstra.c
index d994debafe6408b9c78e37a4d30bbd494679bb9c..352c8d5f787553d6ca6d188c9e9394b022175899 100644 (file)
--- a/lib/neatogen/dijkstra.c
+++ b/lib/neatogen/dijkstra.c
@@ -21,6 +21,7 @@
 #include <neatogen/bfs.h>
 #include <neatogen/dijkstra.h>
 #include <limits.h>
+#include <stdbool.h>
 #include <stdlib.h>
 /* #include <math.h> */
 
@@ -97,10 +98,10 @@ initHeap(heap * h, int startVertex, int index[], Word dist[], int n)
        heapify(h, j, index, dist);
 }
 
-static boolean extractMax(heap * h, int *max, int index[], Word dist[])
+static bool extractMax(heap * h, int *max, int index[], Word dist[])
 {
     if (h->heapSize == 0)
-       return FALSE;
+       return false;
 
     *max = h->data[0];
     h->data[0] = h->data[h->heapSize - 1];
@@ -108,7 +109,7 @@ static boolean extractMax(heap * h, int *max, int index[], Word dist[])
     h->heapSize--;
     heapify(h, 0, index, dist);
 
-    return TRUE;
+    return true;
 }
 
 static void