From 6c2a4cdbdb1024e7069b1c51bb046d64750e30a5 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 14 Feb 2011 15:09:32 +0000
Subject: xkbcomp mesa git update 14 Feb 2011

---
 xkbcomp/geometry.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'xkbcomp/geometry.c')

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);
-- 
cgit v1.2.3