diff options
| author | Ran Benita <ran234@gmail.com> | 2012-04-08 15:37:36 +0300 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2012-04-09 13:48:00 +0100 |
| commit | 2590b5a15d9f685dacce79d8d4bc23906008036b (patch) | |
| tree | a32167410151340d3eac2b9903199e34fd78bd29 /src | |
| parent | d007cd0a1f3f4b9c927175771ff79aae6fe4ab8b (diff) | |
| download | xorg-lib-libxkbcommon-2590b5a15d9f685dacce79d8d4bc23906008036b.tar.gz | |
Fix compiler warnings
(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.]
Diffstat (limited to 'src')
| -rw-r--r-- | src/maprules.c | 5 | ||||
| -rw-r--r-- | src/xkbcomp/symbols.c | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/maprules.c b/src/maprules.c index 8015b55..6a6e616 100644 --- a/src/maprules.c +++ b/src/maprules.c @@ -562,9 +562,8 @@ static void 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 diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c index 5548e5b..f8f5881 100644 --- a/src/xkbcomp/symbols.c +++ b/src/xkbcomp/symbols.c @@ -1941,9 +1941,8 @@ CopySymbolsDef(struct xkb_keymap * xkb, KeyInfo *key, int start_from) 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); |