Commit d8518ba6 authored by Petr Špaček's avatar Petr Špaček

Merge branch 'lua-libknot-regression' into 'master'

lua bindings: fix a regression from b42195a2

Closes #514

See merge request !873
parents 4765d0ae 35258d44
Pipeline #53705 passed with stages
in 14 minutes and 23 seconds
Knot Resolver 4.2.2 (2019-10-dd)
================================
Bugfixes
--------
- lua bindings: fix a 4.2.1 regression on 32-bit systems (#514)
which also fixes libknot 2.9 support on all systems
Knot Resolver 4.2.1 (2019-09-26)
================================
......
......@@ -65,14 +65,14 @@ if not sover_pos then
error('unexpected libknot soname: ' .. libknot_SONAME)
end
local sover = string.sub(libknot_SONAME, sover_pos , sover_pos)
if sover == '8' then
if sover == '9' then
knot_rdataset_t_cdef = [[
typedef struct {
uint16_t count;
knot_rdata_t *rdata;
} knot_rdataset_t;
]]
elseif sover == '9' then
elseif sover == '1' then -- it's 10 really, but this is simpler
knot_rdataset_t_cdef = [[
typedef struct {
uint16_t count;
......
......@@ -58,7 +58,7 @@ int sd_watchdog_init(struct kr_module *module)
return kr_error(ret);
}
kr_log_verbose("[sd_watchdog] enabled (repeat: %ld ms, timeout: %ld ms)\n",
kr_log_verbose("[sd_watchdog] enabled (repeat: %"PRIu64" ms, timeout: %"PRIu64" ms)\n",
delay_ms, conf->timeout_usec / 1000);
return kr_ok();
......
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