Blame SOURCES/0001-compat-don-t-warn-about-redefinition-when-nothing-is.patch
|
 |
aea5f6 |
From 839ccda42d8b088d94324cd77c4be954859914d3 Mon Sep 17 00:00:00 2001
|
|
|
aea5f6 |
From: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
aea5f6 |
Date: Wed, 28 Aug 2013 15:20:56 +1000
|
|
|
aea5f6 |
Subject: [PATCH xkbcomp] compat: don't warn about redefinition when nothing is
|
|
|
aea5f6 |
defined yet
|
|
|
aea5f6 |
|
|
|
aea5f6 |
info->groupCompat[i] is bzero'd on init, define is 0. Don't warn when that
|
|
|
aea5f6 |
is the case, otherwise any "group 2 = ..." statement will cause an error.
|
|
|
aea5f6 |
|
|
|
aea5f6 |
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
aea5f6 |
---
|
|
|
aea5f6 |
compat.c | 2 +-
|
|
|
aea5f6 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
aea5f6 |
|
|
|
aea5f6 |
diff --git a/xkbcomp-1.2.4/compat.c b/compat.c
|
|
|
aea5f6 |
index 2b00142..f4d82a6 100644
|
|
|
aea5f6 |
--- a/xkbcomp-1.2.4/compat.c
|
|
|
aea5f6 |
+++ b/xkbcomp-1.2.4/compat.c
|
|
|
aea5f6 |
@@ -274,7 +274,7 @@ AddGroupCompat(CompatInfo * info, unsigned group, GroupCompatInfo * newGC)
|
|
|
aea5f6 |
{
|
|
|
aea5f6 |
return True;
|
|
|
aea5f6 |
}
|
|
|
aea5f6 |
- if (((gc->fileID == newGC->fileID) && (warningLevel > 0))
|
|
|
aea5f6 |
+ if (((gc->defined && gc->fileID == newGC->fileID) && (warningLevel > 0))
|
|
|
aea5f6 |
|| (warningLevel > 9))
|
|
|
aea5f6 |
{
|
|
|
aea5f6 |
WARN1("Compat map for group %d redefined\n", group + 1);
|
|
|
aea5f6 |
--
|
|
|
aea5f6 |
1.8.2.1
|
|
|
aea5f6 |
|