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

xkb: rename XkbAddGeomSection() to SrvXkbAddGeomSection() 

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:45:15 +01:00 committed by Enrico Weigelt, metux IT consult .
parent 04cbc6d134
commit 938b536223
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xkb/XKBGAlloc.c
View File

@ -708,8 +708,8 @@ SrvXkbAddGeomRow(XkbSectionPtr section, int sz_keys)
}
XkbSectionPtr
XkbAddGeomSection(XkbGeometryPtr geom,
Atom name, int sz_rows, int sz_doodads, int sz_over)
SrvXkbAddGeomSection(XkbGeometryPtr geom,
Atom name, int sz_rows, int sz_doodads, int sz_over)
{
register int i;
XkbSectionPtr section;

4
xkb/xkb.c
View File

@ -5356,8 +5356,8 @@ _CheckSetSections(XkbGeometryPtr geom,
swaps(&sWire->angle);
}
CHK_ATOM_ONLY(sWire->name);
section = XkbAddGeomSection(geom, sWire->name, sWire->nRows,
sWire->nDoodads, sWire->nOverlays);
section = SrvXkbAddGeomSection(geom, sWire->name, sWire->nRows,
sWire->nDoodads, sWire->nOverlays);
if (!section)
return BadAlloc;
section->priority = sWire->priority;

12
xkb/xkbgeom.h
View File

@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "xkbstr.h"
#define XkbAddGeomSection SrvXkbAddGeomSection
#define XkbAddGeomShape SrvXkbAddGeomShape
#define XkbAllocGeometry SrvXkbAllocGeometry
#define XkbFreeGeomKeyAliases SrvXkbFreeGeomKeyAliases
@ -324,12 +323,11 @@ extern XkbShapePtr XkbAddGeomShape(XkbGeometryPtr /* geom */ ,
XkbKeyPtr SrvXkbAddGeomKey(XkbRowPtr row);
XkbRowPtr SrvXkbAddGeomRow(XkbSectionPtr section, int sz_keys);
extern XkbSectionPtr XkbAddGeomSection(XkbGeometryPtr /* geom */ ,
Atom /* name */ ,
int /* sz_rows */ ,
int /* sz_doodads */ ,
int /* sz_overlays */
);
XkbSectionPtr SrvXkbAddGeomSection(XkbGeometryPtr geom,
Atom name,
int sz_rows,
int sz_doodads,
int sz_overlays);
XkbOverlayPtr SrvXkbAddGeomOverlay(XkbSectionPtr section,
Atom name,

6
xkb/xkmread.c
View File

@ -966,9 +966,9 @@ ReadXkmGeomSection(FILE * file, XkbGeometryPtr geom)
nameAtom = XkbInternAtom(buf, FALSE);
tmp = fread(&sectionWire, SIZEOF(xkmSectionDesc), 1, file);
nRead += SIZEOF(xkmSectionDesc) * tmp;
section = XkbAddGeomSection(geom, nameAtom, sectionWire.num_rows,
sectionWire.num_doodads,
sectionWire.num_overlays);
section = SrvXkbAddGeomSection(geom, nameAtom, sectionWire.num_rows,
sectionWire.num_doodads,
sectionWire.num_overlays);
if (!section) {
_XkbLibError(_XkbErrBadAlloc, "ReadXkmGeomSection", 0);
return nRead;