API BREAK: remove 'NIL' macros

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8bdcf44e5b510a1ee06b8b8a83c6dab88ccbeb58..45bf78676bc9a44e19c9214e40e0b37802781fc6 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   symbol to be set to ensure correct linking.
 - **Breaking**: Graphviz headers no longer define the constant `MAXSHORT`. A
   drop-in replacement is `SHRT_MAX` in the C standard library’s limits.h.
+- **Breaking**: Graphviz headers no lnger define `NIL` macros. A drop-in
+  replacement is `NULL` in the C standard library’s stddef.h.
 - **Breaking**: Graphviz headers no longer define the `NOT` macro. A drop-in
   replacement is the C/C++ operator `!`.
 - **Breaking**: Graphviz headers no longer (re-)define the C constants `INT_MIN`

diff --git a/lib/cdt/dthdr.h b/lib/cdt/dthdr.h
index 34625bd3c2b6e043aeca1eaf9c73671a59544dce..27ae9463bd19eb494f41b7554895a1ed50772972 100644 (file)
--- a/lib/cdt/dthdr.h
+++ b/lib/cdt/dthdr.h
@@ -9,7 +9,6 @@
 #include       <cdt.h>
 
 /* short-hand notations */
-#define NIL(t) ((t)0)
 #define uint   unsigned int
 #define left   hl._left
 #define hash   hl._hash

diff --git a/lib/cgraph/cgraph.h b/lib/cgraph/cgraph.h
index 4d1a5feea64dce935bdf5d0c9c0bc3ebcec180a9..cbec3bbe6074ba68962c615da481c5a40c78edf8 100644 (file)
--- a/lib/cgraph/cgraph.h
+++ b/lib/cgraph/cgraph.h
@@ -35,13 +35,6 @@ extern "C" {
 #ifndef TRUE
 #define TRUE (!FALSE)
 #endif
-#ifndef NIL
-#define NIL(type)              ((type)0)
-#endif
-#define NILgraph               NIL(Agraph_t*)
-#define NILnode                        NIL(Agnode_t*)
-#define NILedge                        NIL(Agedge_t*)
-#define NILsym                 NIL(Agsym_t*)
 
 typedef uint64_t IDTYPE;
 

diff --git a/lib/common/logic.h b/lib/common/logic.h
index b6ea30f41060565ef80c99354a360be560176f46..dfafc0318abfbc53e269596956639ccc9d00606a 100644 (file)
--- a/lib/common/logic.h
+++ b/lib/common/logic.h
@@ -27,10 +27,6 @@ extern "C" {
 #define NOTUSED(var) (void) var
 #endif
 
-#ifndef NIL
-#define NIL(type) ((type)0)
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/common/macros.h b/lib/common/macros.h
index a8e73bc33c2b493dc77bad2ecfafc38c296efc00..cabd7a7777ee919a021a9ae4c232ac3bc7d05e72 100644 (file)
--- a/lib/common/macros.h
+++ b/lib/common/macros.h
@@ -14,10 +14,6 @@
 #define NOTUSED(var) (void) var
 #endif
 
-#ifndef NIL
-#define NIL(type)  ((type)0)
-#endif
-
 #define isPinned(n)     (ND_pinned(n) == P_PIN)
 #define hasPos(n)       (ND_pinned(n) > 0)
 #define isFixed(n)      (ND_pinned(n) > P_SET)

diff --git a/lib/pathplan/vis.h b/lib/pathplan/vis.h
index 8c19fad07078cf41b897effbcbca18f790ac8d86..e59dc53378dc4d568ed85558dbc5a938f5e5c6b4 100644 (file)
--- a/lib/pathplan/vis.h
+++ b/lib/pathplan/vis.h
@@ -25,7 +25,6 @@ extern "C" {
     typedef COORD **array2;
 
 #define EQ(p,q)                ((p.x == q.x) && (p.y == q.y))
-#define NIL(p)         ((p)0)
 
     struct vconfig_s {
        int Npoly;

diff --git a/lib/sfio/sfhdr.h b/lib/sfio/sfhdr.h
index ab90b6bee75ceea2f2d10793e29d81e7f7e917c6..53ad00b07b16b0d80121412a562bdf686db31e77 100644 (file)
--- a/lib/sfio/sfhdr.h
+++ b/lib/sfio/sfhdr.h
@@ -116,7 +116,6 @@ extern "C" {
 #define SF_LOCAL       00100000u       /* sentinel for a local call            */
 
 /* short-hands */
-#define NIL(t)         ((t)0)
 #ifndef uchar
 #define uchar          unsigned char
 #endif

diff --git a/tclpkg/tclpathplan/simple.h b/tclpkg/tclpathplan/simple.h
index 724d5c4a7ef9e7ec53e2fc55c72c8062a0c29bcd..0d47b3a692d63f54c15a94d1bddfc7811106bc11 100644 (file)
--- a/tclpkg/tclpathplan/simple.h
+++ b/tclpkg/tclpathplan/simple.h
@@ -13,8 +13,6 @@
 #define MAXINTS  10000         /* modify this line to reflect the max no. of 
                                   intersections you want reported -- 50000 seems to break the program */
 
-#define NIL 0
-
 #define SLOPE(p,q) ( ( ( p.y ) - ( q.y ) ) / ( ( p.x ) - ( q.x ) ) )
 #define MAX(a,b) ( ( a ) > ( b ) ? ( a ) : ( b ) )