Silence a couple of warnings

These appear to come and go randomly.

Signed-off-by: Ran Benita <ran234@gmail.com>

diff --git a/src/xkbcomp/keycodes.c b/src/xkbcomp/keycodes.c
index 91e2368..c05f799 100644 (file)
--- a/src/xkbcomp/keycodes.c
+++ b/src/xkbcomp/keycodes.c
@@ -473,7 +473,7 @@ HandleKeycodeDef(KeyNamesInfo *info, KeycodeDef *stmt, enum merge_mode merge)
     if (stmt->value < 0 || stmt->value > XKB_KEYCODE_MAX) {
         log_err(info->ctx,
                 "Illegal keycode %lld: must be between 0..%u; "
-                "Key ignored\n", stmt->value, XKB_KEYCODE_MAX);
+                "Key ignored\n", (long long) stmt->value, XKB_KEYCODE_MAX);
         return false;
     }
 

diff --git a/src/xkbcomp/parser-priv.h b/src/xkbcomp/parser-priv.h
index 5490d16..2e02db6 100644 (file)
--- a/src/xkbcomp/parser-priv.h
+++ b/src/xkbcomp/parser-priv.h
@@ -30,7 +30,10 @@
 struct scanner_extra;
 struct parser_param;
 
+#pragma GCC diagnostic ignored "-Wredundant-decls"
+#pragma GCC diagnostic push
 #include "parser.h"
+#pragma GCC diagnostic pop
 
 void
 scanner_error(YYLTYPE *loc, void *scanner, const char *msg);