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

xkb: rename XkbAllocGeometry() to SrvXkbAllocGeometry() 

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

2
xkb/XKBGAlloc.c
View File

@ -496,7 +496,7 @@ _XkbGeomAlloc(void **old,
(n),sizeof(XkbOverlayKeyRec)) (n),sizeof(XkbOverlayKeyRec))
Status Status
XkbAllocGeometry(XkbDescPtr xkb, XkbGeometrySizesPtr sizes) SrvXkbAllocGeometry(XkbDescPtr xkb, XkbGeometrySizesPtr sizes)
{ {
XkbGeometryPtr geom; XkbGeometryPtr geom;
Status rtrn; Status rtrn;

2
xkb/xkb.c
View File

@ -5627,7 +5627,7 @@ _XkbSetGeometry(ClientPtr client, DeviceIntPtr dev, xkbSetGeometryReq * stuff)
sizes.num_sections = stuff->nSections; sizes.num_sections = stuff->nSections;
sizes.num_doodads = stuff->nDoodads; sizes.num_doodads = stuff->nDoodads;
sizes.num_key_aliases = stuff->nKeyAliases; sizes.num_key_aliases = stuff->nKeyAliases;
if ((status = XkbAllocGeometry(xkb, &sizes)) != Success) { if ((status = SrvXkbAllocGeometry(xkb, &sizes)) != Success) {
xkb->geom = old; xkb->geom = old;
return status; return status;
} }

5
xkb/xkbgeom.h
View File

@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "xkbstr.h" #include "xkbstr.h"
#define XkbAllocGeometry SrvXkbAllocGeometry
#define XkbFreeGeomKeyAliases SrvXkbFreeGeomKeyAliases #define XkbFreeGeomKeyAliases SrvXkbFreeGeomKeyAliases
#define XkbFreeGeomColors SrvXkbFreeGeomColors #define XkbFreeGeomColors SrvXkbFreeGeomColors
#define XkbFreeGeomDoodads SrvXkbFreeGeomDoodads #define XkbFreeGeomDoodads SrvXkbFreeGeomDoodads
@ -504,9 +503,7 @@ extern Status XkbAllocGeomKeys(XkbRowPtr /* row */ ,
int /* nKeys */ int /* nKeys */
); );
extern Status XkbAllocGeometry(XkbDescPtr /* xkb */ , Status SrvXkbAllocGeometry(XkbDescPtr xkb, XkbGeometrySizesPtr sizes);
XkbGeometrySizesPtr /* sizes */
);
extern Bool extern Bool
XkbComputeShapeTop(XkbShapePtr /* shape */ , XkbComputeShapeTop(XkbShapePtr /* shape */ ,

2
xkb/xkmread.c
View File

@ -1052,7 +1052,7 @@ ReadXkmGeometry(FILE * file, XkbDescPtr xkb)
sizes.num_sections = wireGeom.num_sections; sizes.num_sections = wireGeom.num_sections;
sizes.num_doodads = wireGeom.num_doodads; sizes.num_doodads = wireGeom.num_doodads;
sizes.num_key_aliases = wireGeom.num_key_aliases; sizes.num_key_aliases = wireGeom.num_key_aliases;
if (XkbAllocGeometry(xkb, &sizes) != Success) { if (SrvXkbAllocGeometry(xkb, &sizes) != Success) {
_XkbLibError(_XkbErrBadAlloc, "ReadXkmGeometry", 0); _XkbLibError(_XkbErrBadAlloc, "ReadXkmGeometry", 0);
return nRead; return nRead;
} }