From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Mon, 26 Jul 2021 19:36:31 +0000 (+0200)
Subject: utils/cache_gc nit: use dynarray from libknot 3.1
X-Git-Tag: v5.4.0~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fda64092b85d837ef19293ba67e4260cdc03e5eb;p=thirdparty%2Fknot-resolver.git

utils/cache_gc nit: use dynarray from libknot 3.1

It's compatible, so the only real effect is avoiding compiler:
warning: "DYNARRAY_VISIBILITY_PUBLIC" redefined
---

diff --git a/utils/cache_gc/kr_cache_gc.c b/utils/cache_gc/kr_cache_gc.c
index baf8644f4..758a6e9a4 100644
--- a/utils/cache_gc/kr_cache_gc.c
+++ b/utils/cache_gc/kr_cache_gc.c
@@ -8,8 +8,16 @@
 // libknot includes
 #include <libknot/libknot.h>
 
+// dynarray is inside libknot since 3.1, but it's differently named
+#ifdef knot_dynarray_declare
+	#define dynarray_declare knot_dynarray_declare
+	#define dynarray_define  knot_dynarray_define
+	#define dynarray_foreach knot_dynarray_foreach
+#else
+	#include <contrib/dynarray.h>
+#endif
+
 // resolver includes
-#include <contrib/dynarray.h>
 #include <lib/cache/api.h>
 #include <lib/cache/impl.h>
 #include <lib/defines.h>