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

2
xkb/XKBGAlloc.c
View File

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

2
xkb/xkb.c
View File

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

10
xkb/xkbgeom.h
View File

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