remove some use of the NIL macro

diff --git a/lib/fdpgen/grid.c b/lib/fdpgen/grid.c
index f99c0136e7aa4569ecd9c7f417c49fed24ea2346..155375333eb26c996ead668448bea2c69930c4d6 100644 (file)
--- a/lib/fdpgen/grid.c
+++ b/lib/fdpgen/grid.c
@@ -27,6 +27,7 @@
 #include <fdpgen/fdp.h>
 #include <fdpgen/grid.h>
 #include <common/macros.h>
+#include <stddef.h>
 
   /* structure for maintaining a free list of cells */
 typedef struct _block {
@@ -148,11 +149,11 @@ static Dtdisc_t gridDisc = {
     sizeof(gridpt),
     offsetof(cell, link),
     (Dtmake_f) newCell,
-    NIL(Dtfree_f),
+    NULL,
     (Dtcompar_f) ijcmpf,
-    NIL(Dthash_f),
-    NIL(Dtmemory_f),
-    NIL(Dtevent_f)
+    NULL,
+    NULL,
+    NULL
 };
 
 /* mkGrid:

diff --git a/lib/fdpgen/layout.c b/lib/fdpgen/layout.c
index cba556ef8c15d447a297e5b16f0451d1910d860d..e2df68e19e5dde6fd53f50f57026bdf7d531ff69 100644 (file)
--- a/lib/fdpgen/layout.c
+++ b/lib/fdpgen/layout.c
@@ -43,6 +43,7 @@
 #include <fdpgen/clusteredges.h>
 #include <fdpgen/dbg.h>
 #include <setjmp.h>
+#include <stddef.h>
 
 static jmp_buf jbuf;
 
@@ -430,7 +431,7 @@ static graph_t *deriveGraph(graph_t * g, layout_info * infop)
        fprintf(stderr, "derive graph _dg_%d of %s\n", infop->gid, agnameof(g));
     infop->gid++;
 
-    dg = agopen("derived", Agstrictdirected,NIL(Agdisc_t *));
+    dg = agopen("derived", Agstrictdirected,NULL);
     agbindrec(dg, "Agraphinfo_t", sizeof(Agraphinfo_t), TRUE);
     GD_alg(dg) = NEW(gdata);   /* freed in freeDeriveGraph */
 #ifdef DEBUG