(They were not reported, see next commit).
The reset function declaration didn't match its name in the definition;
the _defaults variant matches better with the rest.
Signed-off-by: Ran Benita <ran234@gmail.com>
[daniels: Updated to current master.]
* could not be added.
*/
_X_EXPORT int
-xkb_context_include_path_reset(struct xkb_context *context);
+xkb_context_include_path_reset_defaults(struct xkb_context *context);
/**
* Removes all entries from the context's include path.
FreeMultiDefs(XkbRF_MultiDefsPtr defs)
{
free(defs->options);
- /* Avoid -Wcast-qual warnings. */
- free((void *)(uintptr_t)defs->layout[1]);
- free((void *)(uintptr_t)defs->variant[1]);
+ free(UNCONSTIFY(defs->layout[1]));
+ free(UNCONSTIFY(defs->variant[1]));
}
static void
unsigned width, tmp, nGroups;
struct xkb_key_type * type;
Bool haveActions, autoType, useAlias;
- xkb_atom_t types[XkbNumKbdGroups];
+ unsigned types[XkbNumKbdGroups];
union xkb_action *outActs;
-
unsigned int symIndex = 0;
useAlias = (start_from == 0);