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

xkb: rename XkbAddGeomOverlay() to SrvXkbAddGeomOverlay() 

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:25:54 +01:00 committed by Enrico Weigelt, metux IT consult .
parent cb3a805538
commit d0e2eb4015
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

@ -851,7 +851,7 @@ XkbAddGeomOverlayRow(XkbOverlayPtr overlay, int row_under, int sz_keys)
} }
XkbOverlayPtr XkbOverlayPtr
XkbAddGeomOverlay(XkbSectionPtr section, Atom name, int sz_rows) SrvXkbAddGeomOverlay(XkbSectionPtr section, Atom name, int sz_rows)
{ {
register int i; register int i;
XkbOverlayPtr overlay; XkbOverlayPtr overlay;

2
xkb/xkb.c
View File

@ -5290,7 +5290,7 @@ _CheckSetOverlay(char **wire_inout, xkbSetGeometryReq *req,
swapl(&olWire->name); swapl(&olWire->name);
} }
CHK_ATOM_ONLY(olWire->name); CHK_ATOM_ONLY(olWire->name);
ol = XkbAddGeomOverlay(section, olWire->name, olWire->nRows); ol = SrvXkbAddGeomOverlay(section, olWire->name, olWire->nRows);
rWire = (xkbOverlayRowWireDesc *) &olWire[1]; rWire = (xkbOverlayRowWireDesc *) &olWire[1];
for (r = 0; r < olWire->nRows; r++) { for (r = 0; r < olWire->nRows; r++) {
register int k; register int k;

8
xkb/xkbgeom.h
View File

@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "xkbstr.h" #include "xkbstr.h"
#define XkbAddGeomOverlay SrvXkbAddGeomOverlay
#define XkbAddGeomOverlayRow SrvXkbAddGeomOverlayRow #define XkbAddGeomOverlayRow SrvXkbAddGeomOverlayRow
#define XkbAddGeomOverlayKey SrvXkbAddGeomOverlayKey #define XkbAddGeomOverlayKey SrvXkbAddGeomOverlayKey
#define XkbAddGeomProperty SrvXkbAddGeomProperty #define XkbAddGeomProperty SrvXkbAddGeomProperty
@ -340,10 +339,9 @@ extern XkbSectionPtr XkbAddGeomSection(XkbGeometryPtr /* geom */ ,
int /* sz_overlays */ int /* sz_overlays */
); );
extern XkbOverlayPtr XkbAddGeomOverlay(XkbSectionPtr /* section */ , XkbOverlayPtr SrvXkbAddGeomOverlay(XkbSectionPtr section,
Atom /* name */ , Atom name,
int /* sz_rows */ int sz_rows);
);
extern XkbOverlayRowPtr XkbAddGeomOverlayRow(XkbOverlayPtr /* overlay */ , extern XkbOverlayRowPtr XkbAddGeomOverlayRow(XkbOverlayPtr /* overlay */ ,
int /* row_under */ , int /* row_under */ ,

2
xkb/xkmread.c
View File

@ -926,7 +926,7 @@ ReadXkmGeomOverlay(FILE * file, XkbGeometryPtr geom, XkbSectionPtr section)
nRead += XkmGetCountedString(file, buf, 100); nRead += XkmGetCountedString(file, buf, 100);
tmp = fread(&olWire, SIZEOF(xkmOverlayDesc), 1, file); tmp = fread(&olWire, SIZEOF(xkmOverlayDesc), 1, file);
nRead += tmp * SIZEOF(xkmOverlayDesc); nRead += tmp * SIZEOF(xkmOverlayDesc);
ol = XkbAddGeomOverlay(section, XkbInternAtom(buf, FALSE), olWire.num_rows); ol = SrvXkbAddGeomOverlay(section, XkbInternAtom(buf, FALSE), olWire.num_rows);
if (!ol) if (!ol)
return nRead; return nRead;
for (r = 0; r < olWire.num_rows; r++) { for (r = 0; r < olWire.num_rows; r++) {