From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Wed, 7 Jul 2021 01:37:22 +0000 (-0700)
Subject: remove KPVDEL guards
X-Git-Tag: 2.48.0~8^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a2272de0ff7abfc071bf303790c86bff4599694;p=graphviz

remove KPVDEL guards

I believe these were used by Kiem-Phong Vo to remind themselves to expose these
definitions unconditionally in future. However, it seems they were never
followed up on. We remove them now to ease ongoing maintenance.
---

diff --git a/lib/cdt/cdt.h b/lib/cdt/cdt.h
index ed16a304c..d32eb7a99 100644
--- a/lib/cdt/cdt.h
+++ b/lib/cdt/cdt.h
@@ -170,8 +170,6 @@ CDT_API extern Dtmethod_t*	Dtstack;
 CDT_API extern Dtmethod_t*	Dtqueue;
 CDT_API extern Dtmethod_t*	Dtdeque;
 
-/* compatibility stuff; will go away */
-#ifndef KPVDEL
 CDT_API extern Dtmethod_t*	Dtorder;
 CDT_API extern Dtmethod_t*	Dttree;
 CDT_API extern Dtmethod_t*	Dthash;
@@ -180,7 +178,6 @@ CDT_API extern Dtmethod_t	_Dthash;
 CDT_API extern Dtmethod_t	_Dtlist;
 CDT_API extern Dtmethod_t	_Dtqueue;
 CDT_API extern Dtmethod_t	_Dtstack;
-#endif
 
 CDT_API Dt_t*		dtopen(Dtdisc_t*, Dtmethod_t*);
 CDT_API int		dtclose(Dt_t*);
diff --git a/lib/cdt/dthash.c b/lib/cdt/dthash.c
index aee47d835..ef8602565 100644
--- a/lib/cdt/dthash.c
+++ b/lib/cdt/dthash.c
@@ -326,7 +326,5 @@ static Dtmethod_t	_Dtbag = { dthash, DT_BAG };
 Dtmethod_t* Dtset = &_Dtset;
 Dtmethod_t* Dtbag = &_Dtbag;
 
-#ifndef KPVDEL	/* for backward compatibility - remove next time */
 Dtmethod_t		_Dthash = { dthash, DT_SET };
 Dtmethod_t* Dthash = &_Dthash;
-#endif
diff --git a/lib/cdt/dtlist.c b/lib/cdt/dtlist.c
index f04ce1cfa..eb0a23b2b 100644
--- a/lib/cdt/dtlist.c
+++ b/lib/cdt/dtlist.c
@@ -168,13 +168,10 @@ static void* dtlist(Dt_t* dt, void* obj, int type)
 	return r ? _DTOBJ(r,lk) : NULL;
 }
 
-#ifndef KPVDEL	/* to be remove next round */
-#define static 
-#endif
-static Dtmethod_t _Dtlist  = { dtlist, DT_LIST  };
-static Dtmethod_t _Dtdeque  = { dtlist, DT_DEQUE  };
-static Dtmethod_t _Dtstack = { dtlist, DT_STACK };
-static Dtmethod_t _Dtqueue = { dtlist, DT_QUEUE };
+Dtmethod_t _Dtlist  = { dtlist, DT_LIST  };
+Dtmethod_t _Dtdeque  = { dtlist, DT_DEQUE  };
+Dtmethod_t _Dtstack = { dtlist, DT_STACK };
+Dtmethod_t _Dtqueue = { dtlist, DT_QUEUE };
 
 Dtmethod_t* Dtlist = &_Dtlist;
 Dtmethod_t* Dtdeque = &_Dtdeque;
diff --git a/lib/cdt/dttree.c b/lib/cdt/dttree.c
index c76f88fb9..645aa6786 100644
--- a/lib/cdt/dttree.c
+++ b/lib/cdt/dttree.c
@@ -353,8 +353,6 @@ static Dtmethod_t	_Dtobag =  { dttree, DT_OBAG };
 Dtmethod_t* Dtoset = &_Dtoset;
 Dtmethod_t* Dtobag = &_Dtobag;
 
-#ifndef KPVDEL /* backward compatibility - delete next time around */
 Dtmethod_t		_Dttree = { dttree, DT_OSET };
 Dtmethod_t* Dtorder = &_Dttree;
 Dtmethod_t* Dttree = &_Dttree;
-#endif