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

xkb: rename XkbAddGeomKey() to SrvXkbAddGeomKey() 

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-28 17:20:07 +01:00 committed by Enrico Weigelt, metux IT consult .
parent 329a4e3b57
commit 0df6506f75
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xkb/XKBGAlloc.c
View File

@ -676,7 +676,7 @@ XkbAddGeomShape(XkbGeometryPtr geom, Atom name, int sz_outlines)
}
XkbKeyPtr
XkbAddGeomKey(XkbRowPtr row)
SrvXkbAddGeomKey(XkbRowPtr row)
{
XkbKeyPtr key;

2
xkb/xkb.c
View File

@ -5392,7 +5392,7 @@ _CheckSetSections(XkbGeometryPtr geom,
if (!_XkbCheckRequestBounds(client, req, kWire, kWire + 1))
return BadLength;
key = XkbAddGeomKey(row);
key = SrvXkbAddGeomKey(row);
if (!key)
return BadAlloc;
memcpy(key->name.name, kWire->name, XkbKeyNameLength);

4
xkb/xkbgeom.h
View File

@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "xkbstr.h"
#define XkbAddGeomKey SrvXkbAddGeomKey
#define XkbAddGeomOutline SrvXkbAddGeomOutline
#define XkbAddGeomOverlay SrvXkbAddGeomOverlay
#define XkbAddGeomOverlayRow SrvXkbAddGeomOverlayRow
@ -331,8 +330,7 @@ extern XkbShapePtr XkbAddGeomShape(XkbGeometryPtr /* geom */ ,
int /* sz_outlines */
);
extern XkbKeyPtr XkbAddGeomKey(XkbRowPtr /* row */
);
XkbKeyPtr SrvXkbAddGeomKey(XkbRowPtr row);
extern XkbRowPtr XkbAddGeomRow(XkbSectionPtr /* section */ ,
int /* sz_keys */

2
xkb/xkmread.c
View File

@ -1000,7 +1000,7 @@ ReadXkmGeomSection(FILE * file, XkbGeometryPtr geom)
for (k = 0; k < rowWire.num_keys; k++) {
tmp = fread(&keyWire, SIZEOF(xkmKeyDesc), 1, file);
nRead += SIZEOF(xkmKeyDesc) * tmp;
key = XkbAddGeomKey(row);
key = SrvXkbAddGeomKey(row);
if (!key) {
_XkbLibError(_XkbErrBadAlloc, "ReadXkmGeomSection", 0);
return nRead;