From 0b8527a3836cde77269461e22844857bf33e0aea Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Sun, 13 Feb 2011 13:03:05 +0100
Subject: Inline the oiText macro in the only place it's used

Gets rid of a compiler warning:
geometry.c: In function 'HandleOverlayDef':
geometry.c:2578: warning: the address of 'ol' will always evaluate as 'true'

X.Org bug#34219 <https://bugs.freedesktop.org/show_bug.cgi?id=34219>

Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>
---
 geometry.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/geometry.c b/geometry.c
index 6eb3fb8..6d2ca7f 100644
--- a/geometry.c
+++ b/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.1