aboutsummaryrefslogtreecommitdiff
path: root/xkbcomp
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-02-14 15:09:32 +0000
committermarha <marha@users.sourceforge.net>2011-02-14 15:09:32 +0000
commit6c2a4cdbdb1024e7069b1c51bb046d64750e30a5 (patch)
tree3759b543777eef088be2b5f4af9b2f022aaa3524 /xkbcomp
parent026b85e62b3d8812afb5f04df29aeac28c52b331 (diff)
downloadvcxsrv-6c2a4cdbdb1024e7069b1c51bb046d64750e30a5.tar.gz
vcxsrv-6c2a4cdbdb1024e7069b1c51bb046d64750e30a5.tar.bz2
vcxsrv-6c2a4cdbdb1024e7069b1c51bb046d64750e30a5.zip
xkbcomp mesa git update 14 Feb 2011
Diffstat (limited to 'xkbcomp')
-rw-r--r--xkbcomp/geometry.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xkbcomp/geometry.c b/xkbcomp/geometry.c
index 6eb3fb880..6d2ca7f90 100644
--- a/xkbcomp/geometry.c
+++ b/xkbcomp/geometry.c
@@ -179,7 +179,6 @@ typedef struct _OverlayInfo
unsigned short nKeys;
OverlayKeyInfo *keys;
} OverlayInfo;
-#define oiText(d,o) ((o)?XkbAtomText((d),(o)->name,XkbMessage):"default")
#define _GS_Default (1<<0)
@@ -2575,7 +2574,8 @@ HandleOverlayDef(OverlayDef * def,
{
WSGO("Couldn't allocate OverlayKeyInfo\n");
ACTION2("Overlay %s for section %s will be incomplete\n",
- oiText(info->dpy, &ol), scText(info->dpy, si));
+ XkbAtomText(info->dpy, ol.name, XkbMessage),
+ scText(info->dpy, si));
return False;
}
strncpy(key->over, keyDef->over, XkbKeyNameLength);