From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 22 Nov 2020 06:01:33 +0000 (-0800)
Subject: remove some use of the NIL macro
X-Git-Tag: 2.46.1~27^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=80ac60392a99a2b44efe18668ea8f7523154d409;p=graphviz

remove some use of the NIL macro
---

diff --git a/lib/fdpgen/grid.c b/lib/fdpgen/grid.c
index f99c0136e..155375333 100644
--- 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 cba556ef8..e2df68e19 100644
--- 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