From 820de2ee35504452cb02d960a2e7f89b2aec94e0 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 21 Oct 2018 19:30:19 +0200 Subject: [PATCH] fix cont arguments for new clibs version --- clibs | 2 +- src/kernel/item.c | 6 +++--- src/magic.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/clibs b/clibs index 1e1c947c8..ed5c4fee3 160000 --- a/clibs +++ b/clibs @@ -1 +1 @@ -Subproject commit 1e1c947c8034f071c6848dcf1c11138733949825 +Subproject commit ed5c4fee3afbc3d8be79d64857f30702aed522f8 diff --git a/src/kernel/item.c b/src/kernel/item.c index 4e707a48c..00f54a656 100644 --- a/src/kernel/item.c +++ b/src/kernel/item.c @@ -723,7 +723,7 @@ int change_money(unit * u, int v) return 0; } -static int add_resourcename_cb(const void * match, const void * key, +static int add_resourcename_cb(void * match, const void * key, size_t keylen, void *data) { struct locale * lang = (struct locale *)data; @@ -773,7 +773,7 @@ attrib_type at_showitem = { "showitem" }; -static int add_itemname_cb(const void * match, const void * key, +static int add_itemname_cb(void * match, const void * key, size_t keylen, void *data) { struct locale * lang = (struct locale *)data; @@ -919,7 +919,7 @@ void free_rtype(resource_type *rtype) { free(rtype); } -static int free_rtype_cb(const void * match, const void * key, +static int free_rtype_cb(void * match, const void * key, size_t keylen, void *cbdata) { resource_type *rtype = ((rt_entry *)match)->value;; diff --git a/src/magic.c b/src/magic.c index 7464e286d..415746db0 100644 --- a/src/magic.c +++ b/src/magic.c @@ -2949,7 +2949,7 @@ void free_spellbook(spellbook *sb) { free(sb); } -static int free_spellbook_cb(const void *match, const void *key, size_t keylen, void *data) { +static int free_spellbook_cb(void *match, const void *key, size_t keylen, void *data) { const sb_entry *ent = (const sb_entry *)match; UNUSED_ARG(data); UNUSED_ARG(keylen);