Merge remote-tracking branch 'ran/fixes-cont'

Conflicts:
	src/xkbcomp/expr.c

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

diff --cc src/xkbcomp/expr.c
index 24ea994,5f1a2b8..2f6fb6d
--- 1/src/xkbcomp/expr.c
--- 2/src/xkbcomp/expr.c
+++ b/src/xkbcomp/expr.c
@@@ -672,8 -672,7 +672,8 @@@ in
  ExprResolveLevel(ExprDef * expr,
                   ExprResult * val_rtrn)
  {
-     static LookupEntry level_names[] = {
 +    int ret;
+     static const LookupEntry level_names[] = {
          { "level1", 1 },
          { "level2", 2 },
          { "level3", 3 },

diff --cc src/xkbcomp/keytypes.c
Simple merge