frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xkb: rename XkbAddGeomKeyAlias() to SrvXkbAddGeomKeyAlias() 

Instead of doing dirty preprocessor trick, directly rename the function itself.
(the renaming itself is necessary since libX11 has the same symbol)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-02-24 17:03:33 +01:00 committed by Enrico Weigelt, metux IT consult .
parent 32b3328e49
commit 12f4832d82
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xkb/XKBGAlloc.c
View File

@ -575,7 +575,7 @@ XkbAddGeomProperty(XkbGeometryPtr geom, char *name, char *value)
} }
XkbKeyAliasPtr XkbKeyAliasPtr
XkbAddGeomKeyAlias(XkbGeometryPtr geom, char *aliasStr, char *realStr) SrvXkbAddGeomKeyAlias(XkbGeometryPtr geom, char *aliasStr, char *realStr)
{ {
register int i; register int i;
register XkbKeyAliasPtr alias; register XkbKeyAliasPtr alias;

2
xkb/xkb.c
View File

@ -5599,7 +5599,7 @@ _CheckSetGeom(XkbGeometryPtr geom, xkbSetGeometryReq * req, ClientPtr client)
if (!_XkbCheckRequestBounds(client, req, wire, wire + XkbKeyNameLength)) if (!_XkbCheckRequestBounds(client, req, wire, wire + XkbKeyNameLength))
return BadLength; return BadLength;
if (XkbAddGeomKeyAlias(geom, &wire[XkbKeyNameLength], wire) == NULL) if (SrvXkbAddGeomKeyAlias(geom, &wire[XkbKeyNameLength], wire) == NULL)
return BadAlloc; return BadAlloc;
wire += 2 * XkbKeyNameLength; wire += 2 * XkbKeyNameLength;
} }

8
xkb/xkbgeom.h
View File

@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "xkbstr.h" #include "xkbstr.h"
#define XkbAddGeomKeyAlias SrvXkbAddGeomKeyAlias
#define XkbAddGeomColor SrvXkbAddGeomColor #define XkbAddGeomColor SrvXkbAddGeomColor
#define XkbAddGeomDoodad SrvXkbAddGeomDoodad #define XkbAddGeomDoodad SrvXkbAddGeomDoodad
#define XkbAddGeomKey SrvXkbAddGeomKey #define XkbAddGeomKey SrvXkbAddGeomKey
@ -317,10 +316,9 @@ extern XkbPropertyPtr XkbAddGeomProperty(XkbGeometryPtr /* geom */ ,
char * /* value */ char * /* value */
); );
extern XkbKeyAliasPtr XkbAddGeomKeyAlias(XkbGeometryPtr /* geom */ , XkbKeyAliasPtr SrvXkbAddGeomKeyAlias(XkbGeometryPtr geom,
char * /* alias */ , char *alias,
char * /* real */ char *real);
);
extern XkbColorPtr XkbAddGeomColor(XkbGeometryPtr /* geom */ , extern XkbColorPtr XkbAddGeomColor(XkbGeometryPtr /* geom */ ,
char * /* spec */ , char * /* spec */ ,