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:
parent
32b3328e49
commit
12f4832d82
|
@ -575,7 +575,7 @@ XkbAddGeomProperty(XkbGeometryPtr geom, char *name, char *value)
|
|||
}
|
||||
|
||||
XkbKeyAliasPtr
|
||||
XkbAddGeomKeyAlias(XkbGeometryPtr geom, char *aliasStr, char *realStr)
|
||||
SrvXkbAddGeomKeyAlias(XkbGeometryPtr geom, char *aliasStr, char *realStr)
|
||||
{
|
||||
register int i;
|
||||
register XkbKeyAliasPtr alias;
|
||||
|
|
|
@ -5599,7 +5599,7 @@ _CheckSetGeom(XkbGeometryPtr geom, xkbSetGeometryReq * req, ClientPtr client)
|
|||
if (!_XkbCheckRequestBounds(client, req, wire, wire + XkbKeyNameLength))
|
||||
return BadLength;
|
||||
|
||||
if (XkbAddGeomKeyAlias(geom, &wire[XkbKeyNameLength], wire) == NULL)
|
||||
if (SrvXkbAddGeomKeyAlias(geom, &wire[XkbKeyNameLength], wire) == NULL)
|
||||
return BadAlloc;
|
||||
wire += 2 * XkbKeyNameLength;
|
||||
}
|
||||
|
|
|
@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|||
|
||||
#include "xkbstr.h"
|
||||
|
||||
#define XkbAddGeomKeyAlias SrvXkbAddGeomKeyAlias
|
||||
#define XkbAddGeomColor SrvXkbAddGeomColor
|
||||
#define XkbAddGeomDoodad SrvXkbAddGeomDoodad
|
||||
#define XkbAddGeomKey SrvXkbAddGeomKey
|
||||
|
@ -317,10 +316,9 @@ extern XkbPropertyPtr XkbAddGeomProperty(XkbGeometryPtr /* geom */ ,
|
|||
char * /* value */
|
||||
);
|
||||
|
||||
extern XkbKeyAliasPtr XkbAddGeomKeyAlias(XkbGeometryPtr /* geom */ ,
|
||||
char * /* alias */ ,
|
||||
char * /* real */
|
||||
);
|
||||
XkbKeyAliasPtr SrvXkbAddGeomKeyAlias(XkbGeometryPtr geom,
|
||||
char *alias,
|
||||
char *real);
|
||||
|
||||
extern XkbColorPtr XkbAddGeomColor(XkbGeometryPtr /* geom */ ,
|
||||
char * /* spec */ ,
|
||||
|
|
Loading…
Reference in New Issue