Commit 9c7e5965 authored by Vladimír Čunát's avatar Vladimír Čunát

tweak conditionals to work with knot 3.0.dev

I didn't plan this well ahead :-/
parent df8b2306
Pipeline #54481 failed with stages
in 210 minutes and 41 seconds
......@@ -59,7 +59,7 @@ static int rdataset_materialize(knot_rdataset_t * restrict rds, const uint8_t *
/* TODO: we might overrun here already, but we need to trust cache anyway...*/
const uint32_t rds_size = rdataset_dematerialized_size(d, &rds->count);
d += KR_CACHE_RR_COUNT_SIZE;
#if KNOT_VERSION_MINOR >= 9
#if KNOT_VERSION_HEX >= 0x020900
rds->size = rds_size;
#endif
if (d + rds_size > data_bound) {
......
......@@ -23,7 +23,7 @@
/* TMP: compatibility for using libknot 2.8 API with 2.9. */
#if KNOT_VERSION_MINOR >= 9
#if KNOT_VERSION_HEX >= 0x020900
static inline size_t knot_rdataset_size(const knot_rdataset_t *rrs)
{
return rrs->size;
......
......@@ -37,7 +37,7 @@ static int edns_keepalive_finalize(kr_layer_t *ctx)
req->qsource.flags.tcp &&
src_opt != NULL &&
knot_edns_get_option(src_opt, KNOT_EDNS_OPTION_TCP_KEEPALIVE
#if KNOT_VERSION_MINOR >= 9
#if KNOT_VERSION_HEX >= 0x020900
, NULL
#endif
) &&
......
......@@ -31,7 +31,7 @@ static int nsid_finalize(kr_layer_t *ctx) {
return ctx->state;
const uint8_t *req_nsid = knot_edns_get_option(src_opt, KNOT_EDNS_OPTION_NSID
#if KNOT_VERSION_MINOR >= 9
#if KNOT_VERSION_HEX >= 0x020900
, NULL
#endif
);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment