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

xkb: rename XkbAddGeomOverlayRow() to SrvXkbAddGeomOverlayRow() 

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

@ -819,7 +819,7 @@ XkbAddGeomOverlayKey(XkbOverlayPtr overlay,
} }
XkbOverlayRowPtr XkbOverlayRowPtr
XkbAddGeomOverlayRow(XkbOverlayPtr overlay, int row_under, int sz_keys) SrvXkbAddGeomOverlayRow(XkbOverlayPtr overlay, int row_under, int sz_keys)
{ {
register int i; register int i;
XkbOverlayRowPtr row; XkbOverlayRowPtr row;

2
xkb/xkb.c
View File

@ -5305,7 +5305,7 @@ _CheckSetOverlay(char **wire_inout, xkbSetGeometryReq *req,
rWire->rowUnder); rWire->rowUnder);
return BadMatch; return BadMatch;
} }
row = XkbAddGeomOverlayRow(ol, rWire->rowUnder, rWire->nKeys); row = SrvXkbAddGeomOverlayRow(ol, rWire->rowUnder, rWire->nKeys);
kWire = (xkbOverlayKeyWireDesc *) &rWire[1]; kWire = (xkbOverlayKeyWireDesc *) &rWire[1];
for (k = 0; k < rWire->nKeys; k++, kWire++) { for (k = 0; k < rWire->nKeys; k++, kWire++) {
if (!_XkbCheckRequestBounds(client, req, kWire, kWire + 1)) if (!_XkbCheckRequestBounds(client, req, kWire, kWire + 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 XkbAddGeomOverlayRow SrvXkbAddGeomOverlayRow
#define XkbAddGeomOverlayKey SrvXkbAddGeomOverlayKey #define XkbAddGeomOverlayKey SrvXkbAddGeomOverlayKey
#define XkbAddGeomProperty SrvXkbAddGeomProperty #define XkbAddGeomProperty SrvXkbAddGeomProperty
#define XkbAddGeomRow SrvXkbAddGeomRow #define XkbAddGeomRow SrvXkbAddGeomRow
@ -343,10 +342,9 @@ XkbOverlayPtr SrvXkbAddGeomOverlay(XkbSectionPtr section,
Atom name, Atom name,
int sz_rows); int sz_rows);
extern XkbOverlayRowPtr XkbAddGeomOverlayRow(XkbOverlayPtr /* overlay */ , XkbOverlayRowPtr SrvXkbAddGeomOverlayRow(XkbOverlayPtr overlay,
int /* row_under */ , int row_under,
int /* sz_keys */ int sz_keys);
);
extern XkbOverlayKeyPtr XkbAddGeomOverlayKey(XkbOverlayPtr /* overlay */ , extern XkbOverlayKeyPtr XkbAddGeomOverlayKey(XkbOverlayPtr /* overlay */ ,
XkbOverlayRowPtr /* row */ , XkbOverlayRowPtr /* row */ ,

2
xkb/xkmread.c
View File

@ -935,7 +935,7 @@ ReadXkmGeomOverlay(FILE * file, XkbGeometryPtr geom, XkbSectionPtr section)
tmp = fread(&rowWire, SIZEOF(xkmOverlayRowDesc), 1, file); tmp = fread(&rowWire, SIZEOF(xkmOverlayRowDesc), 1, file);
nRead += tmp * SIZEOF(xkmOverlayRowDesc); nRead += tmp * SIZEOF(xkmOverlayRowDesc);
row = XkbAddGeomOverlayRow(ol, rowWire.row_under, rowWire.num_keys); row = SrvXkbAddGeomOverlayRow(ol, rowWire.row_under, rowWire.num_keys);
if (!row) { if (!row) {
_XkbLibError(_XkbErrBadAlloc, "ReadXkmGeomOverlay", 0); _XkbLibError(_XkbErrBadAlloc, "ReadXkmGeomOverlay", 0);
return nRead; return nRead;