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

xkb: rename XkbAddGeomShape() to SrvXkbAddGeomShape() 

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:46:42 +01:00 committed by Enrico Weigelt, metux IT consult .
parent 938b536223
commit 9bcc5de027
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xkb/XKBGAlloc.c
View File

@ -649,7 +649,7 @@ SrvXkbAddGeomOutline(XkbShapePtr shape, int sz_points)
} }
XkbShapePtr XkbShapePtr
XkbAddGeomShape(XkbGeometryPtr geom, Atom name, int sz_outlines) SrvXkbAddGeomShape(XkbGeometryPtr geom, Atom name, int sz_outlines)
{ {
XkbShapePtr shape; XkbShapePtr shape;
register int i; register int i;

2
xkb/xkb.c
View File

@ -5464,7 +5464,7 @@ _CheckSetShapes(XkbGeometryPtr geom,
return BadLength; return BadLength;
shape = shape =
XkbAddGeomShape(geom, shapeWire->name, shapeWire->nOutlines); SrvXkbAddGeomShape(geom, shapeWire->name, shapeWire->nOutlines);
if (!shape) if (!shape)
return BadAlloc; return BadAlloc;
olWire = (xkbOutlineWireDesc *) (&shapeWire[1]); olWire = (xkbOutlineWireDesc *) (&shapeWire[1]);

8
xkb/xkbgeom.h
View File

@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "xkbstr.h" #include "xkbstr.h"
#define XkbAddGeomShape SrvXkbAddGeomShape
#define XkbAllocGeometry SrvXkbAllocGeometry #define XkbAllocGeometry SrvXkbAllocGeometry
#define XkbFreeGeomKeyAliases SrvXkbFreeGeomKeyAliases #define XkbFreeGeomKeyAliases SrvXkbFreeGeomKeyAliases
#define XkbFreeGeomColors SrvXkbFreeGeomColors #define XkbFreeGeomColors SrvXkbFreeGeomColors
@ -315,10 +314,9 @@ XkbColorPtr SrvXkbAddGeomColor(XkbGeometryPtr geom,
XkbOutlinePtr SrvXkbAddGeomOutline(XkbShapePtr shape, int sz_points); XkbOutlinePtr SrvXkbAddGeomOutline(XkbShapePtr shape, int sz_points);
extern XkbShapePtr XkbAddGeomShape(XkbGeometryPtr /* geom */ , XkbShapePtr SrvXkbAddGeomShape(XkbGeometryPtr geom,
Atom /* name */ , Atom name,
int /* sz_outlines */ int sz_outlines);
);
XkbKeyPtr SrvXkbAddGeomKey(XkbRowPtr row); XkbKeyPtr SrvXkbAddGeomKey(XkbRowPtr row);
XkbRowPtr SrvXkbAddGeomRow(XkbSectionPtr section, int sz_keys); XkbRowPtr SrvXkbAddGeomRow(XkbSectionPtr section, int sz_keys);

2
xkb/xkmread.c
View File

@ -1099,7 +1099,7 @@ ReadXkmGeometry(FILE * file, XkbDescPtr xkb)
nameAtom = XkbInternAtom(buf, FALSE); nameAtom = XkbInternAtom(buf, FALSE);
tmp = fread(&shapeWire, SIZEOF(xkmShapeDesc), 1, file); tmp = fread(&shapeWire, SIZEOF(xkmShapeDesc), 1, file);
nRead += tmp * SIZEOF(xkmShapeDesc); nRead += tmp * SIZEOF(xkmShapeDesc);
shape = XkbAddGeomShape(geom, nameAtom, shapeWire.num_outlines); shape = SrvXkbAddGeomShape(geom, nameAtom, shapeWire.num_outlines);
if (!shape) { if (!shape) {
_XkbLibError(_XkbErrBadAlloc, "ReadXkmGeometry", 0); _XkbLibError(_XkbErrBadAlloc, "ReadXkmGeometry", 0);
return nRead; return nRead;