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

xkb: rename XkbAddGeomRow() to SrvXkbAddGeomRow() 

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

2
xkb/XKBGAlloc.c
View File

@ -690,7 +690,7 @@ SrvXkbAddGeomKey(XkbRowPtr row)
} }
XkbRowPtr XkbRowPtr
XkbAddGeomRow(XkbSectionPtr section, int sz_keys) SrvXkbAddGeomRow(XkbSectionPtr section, int sz_keys)
{ {
XkbRowPtr row; XkbRowPtr row;

2
xkb/xkb.c
View File

@ -5379,7 +5379,7 @@ _CheckSetSections(XkbGeometryPtr geom,
swaps(&rWire->top); swaps(&rWire->top);
swaps(&rWire->left); swaps(&rWire->left);
} }
row = XkbAddGeomRow(section, rWire->nKeys); row = SrvXkbAddGeomRow(section, rWire->nKeys);
if (!row) if (!row)
return BadAlloc; return BadAlloc;
row->top = rWire->top; row->top = rWire->top;

6
xkb/xkbgeom.h
View File

@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "xkbstr.h" #include "xkbstr.h"
#define XkbAddGeomRow SrvXkbAddGeomRow
#define XkbAddGeomSection SrvXkbAddGeomSection #define XkbAddGeomSection SrvXkbAddGeomSection
#define XkbAddGeomShape SrvXkbAddGeomShape #define XkbAddGeomShape SrvXkbAddGeomShape
#define XkbAllocGeometry SrvXkbAllocGeometry #define XkbAllocGeometry SrvXkbAllocGeometry
@ -323,10 +322,7 @@ extern XkbShapePtr XkbAddGeomShape(XkbGeometryPtr /* geom */ ,
); );
XkbKeyPtr SrvXkbAddGeomKey(XkbRowPtr row); XkbKeyPtr SrvXkbAddGeomKey(XkbRowPtr row);
XkbRowPtr SrvXkbAddGeomRow(XkbSectionPtr section, int sz_keys);
extern XkbRowPtr XkbAddGeomRow(XkbSectionPtr /* section */ ,
int /* sz_keys */
);
extern XkbSectionPtr XkbAddGeomSection(XkbGeometryPtr /* geom */ , extern XkbSectionPtr XkbAddGeomSection(XkbGeometryPtr /* geom */ ,
Atom /* name */ , Atom /* name */ ,

2
xkb/xkmread.c
View File

@ -989,7 +989,7 @@ ReadXkmGeomSection(FILE * file, XkbGeometryPtr geom)
for (i = 0; i < sectionWire.num_rows; i++) { for (i = 0; i < sectionWire.num_rows; i++) {
tmp = fread(&rowWire, SIZEOF(xkmRowDesc), 1, file); tmp = fread(&rowWire, SIZEOF(xkmRowDesc), 1, file);
nRead += SIZEOF(xkmRowDesc) * tmp; nRead += SIZEOF(xkmRowDesc) * tmp;
row = XkbAddGeomRow(section, rowWire.num_keys); row = SrvXkbAddGeomRow(section, rowWire.num_keys);
if (!row) { if (!row) {
_XkbLibError(_XkbErrBadAlloc, "ReadXkmKeycodes", 0); _XkbLibError(_XkbErrBadAlloc, "ReadXkmKeycodes", 0);
return nRead; return nRead;