From 9e23b44bfe1e6e85231b1c07d945cadf0c868648 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 16 Oct 2013 11:23:27 +0200
Subject: fontconfig libxcb libxcb/xcb-proto xserver mesa pixman xkbcomp git
update 16 oct 2013
xserver commit 7cf1b595c8c8f9776a39559d2878cf90af3f2859
libxcb commit e4e0c6eec861f4c69da12060dc8dbe7a63fa5eb6
libxcb/xcb-proto commit 55c75accecf0e76d2aa38656efd2be4044b9e643
xkbcomp commit 839ccda42d8b088d94324cd77c4be954859914d3
pixman commit 9e81419ed5c0ee490ddacf7bada516a25cae87eb
fontconfig commit 5406919c5e186f74ccdade1a65344ce7b5c56a64
mesa commit 6e444a72c1f9e4446e025b8cb780523cb89f0584
---
xkbcomp/compat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'xkbcomp')
diff --git a/xkbcomp/compat.c b/xkbcomp/compat.c
index 2b0014244..f4d82a6de 100644
--- a/xkbcomp/compat.c
+++ b/xkbcomp/compat.c
@@ -274,7 +274,7 @@ AddGroupCompat(CompatInfo * info, unsigned group, GroupCompatInfo * newGC)
{
return True;
}
- if (((gc->fileID == newGC->fileID) && (warningLevel > 0))
+ if (((gc->defined && gc->fileID == newGC->fileID) && (warningLevel > 0))
|| (warningLevel > 9))
{
WARN1("Compat map for group %d redefined\n", group + 1);
--
cgit v1.2.3