diff options
| author | Julien Cristau <jcristau@debian.org> | 2011-02-13 13:03:05 +0100 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2011-02-13 21:21:27 +0100 |
| commit | 0b8527a3836cde77269461e22844857bf33e0aea (patch) | |
| tree | 425addbf5fde3bf3792a3885adadf01057a31d4c | |
| parent | c8375bcb7eb9f86ca1534cdf1143e91372d0499e (diff) | |
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>
| -rw-r--r-- | geometry.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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); |