]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
utils/cache_gc nit: use dynarray from libknot 3.1
authorVladimír Čunát <vladimir.cunat@nic.cz>
Mon, 26 Jul 2021 19:36:31 +0000 (21:36 +0200)
committerVladimír Čunát <vladimir.cunat@nic.cz>
Mon, 26 Jul 2021 19:45:42 +0000 (21:45 +0200)
It's compatible, so the only real effect is avoiding compiler:
warning: "DYNARRAY_VISIBILITY_PUBLIC" redefined

utils/cache_gc/kr_cache_gc.c

index baf8644f48b77aae04e4849200143840f8963421..758a6e9a4f537828e7f21522d27d8b04a26f76d4 100644 (file)
@@ -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>