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

xkb: rename XkbAddGeomOverlayKey() to SrvXkbAddGeomOverlayKey() 

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:29:38 +01:00 committed by Enrico Weigelt, metux IT consult .
parent b133d8fa2d
commit d19cb7e6a7
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xkb/XKBGAlloc.c
View File

@ -785,8 +785,8 @@ SrvXkbAddGeomDoodad(XkbGeometryPtr geom, XkbSectionPtr section, Atom name)
}
XkbOverlayKeyPtr
XkbAddGeomOverlayKey(XkbOverlayPtr overlay,
XkbOverlayRowPtr row, char *over, char *under)
SrvXkbAddGeomOverlayKey(XkbOverlayPtr overlay,
XkbOverlayRowPtr row, char *over, char *under)
{
register int i;
XkbOverlayKeyPtr key;

6
xkb/xkb.c
View File

@ -5311,9 +5311,9 @@ _CheckSetOverlay(char **wire_inout, xkbSetGeometryReq *req,
if (!_XkbCheckRequestBounds(client, req, kWire, kWire + 1))
return BadLength;
if (XkbAddGeomOverlayKey(ol, row,
(char *) kWire->over,
(char *) kWire->under) == NULL) {
if (SrvXkbAddGeomOverlayKey(ol, row,
(char *) kWire->over,
(char *) kWire->under) == NULL) {
client->errorValue = _XkbErrCode3(0x21, r, k);
return BadMatch;
}

10
xkb/xkbgeom.h
View File

@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "xkbstr.h"
#define XkbAddGeomOverlayKey SrvXkbAddGeomOverlayKey
#define XkbAddGeomProperty SrvXkbAddGeomProperty
#define XkbAddGeomRow SrvXkbAddGeomRow
#define XkbAddGeomSection SrvXkbAddGeomSection
@ -346,11 +345,10 @@ XkbOverlayRowPtr SrvXkbAddGeomOverlayRow(XkbOverlayPtr overlay,
int row_under,
int sz_keys);
extern XkbOverlayKeyPtr XkbAddGeomOverlayKey(XkbOverlayPtr /* overlay */ ,
XkbOverlayRowPtr /* row */ ,
char * /* over */ ,
char * /* under */
);
XkbOverlayKeyPtr SrvXkbAddGeomOverlayKey(XkbOverlayPtr overlay,
XkbOverlayRowPtr row,
char *over,
char *under);
XkbDoodadPtr SrvXkbAddGeomDoodad(XkbGeometryPtr geom,
XkbSectionPtr section,