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

xkb: rename XkbAddGeomOutline() to SrvXkbAddGeomOutline() 

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:22:42 +01:00 committed by Enrico Weigelt, metux IT consult .
parent 0df6506f75
commit cb3a805538
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

@ -630,7 +630,7 @@ SrvXkbAddGeomColor(XkbGeometryPtr geom, char *spec, unsigned int pixel)
} }
XkbOutlinePtr XkbOutlinePtr
XkbAddGeomOutline(XkbShapePtr shape, int sz_points) SrvXkbAddGeomOutline(XkbShapePtr shape, int sz_points)
{ {
XkbOutlinePtr outline; XkbOutlinePtr outline;

2
xkb/xkb.c
View File

@ -5476,7 +5476,7 @@ _CheckSetShapes(XkbGeometryPtr geom,
if (!_XkbCheckRequestBounds(client, req, olWire, olWire + 1)) if (!_XkbCheckRequestBounds(client, req, olWire, olWire + 1))
return BadLength; return BadLength;
ol = XkbAddGeomOutline(shape, olWire->nPoints); ol = SrvXkbAddGeomOutline(shape, olWire->nPoints);
if (!ol) if (!ol)
return BadAlloc; return BadAlloc;
ol->corner_radius = olWire->cornerRadius; ol->corner_radius = olWire->cornerRadius;

5
xkb/xkbgeom.h
View File

@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "xkbstr.h" #include "xkbstr.h"
#define XkbAddGeomOutline SrvXkbAddGeomOutline
#define XkbAddGeomOverlay SrvXkbAddGeomOverlay #define XkbAddGeomOverlay SrvXkbAddGeomOverlay
#define XkbAddGeomOverlayRow SrvXkbAddGeomOverlayRow #define XkbAddGeomOverlayRow SrvXkbAddGeomOverlayRow
#define XkbAddGeomOverlayKey SrvXkbAddGeomOverlayKey #define XkbAddGeomOverlayKey SrvXkbAddGeomOverlayKey
@ -321,9 +320,7 @@ XkbColorPtr SrvXkbAddGeomColor(XkbGeometryPtr geom,
char *spec, char *spec,
unsigned int pixel); unsigned int pixel);
extern XkbOutlinePtr XkbAddGeomOutline(XkbShapePtr /* shape */ , XkbOutlinePtr SrvXkbAddGeomOutline(XkbShapePtr shape, int sz_points);
int /* sz_points */
);
extern XkbShapePtr XkbAddGeomShape(XkbGeometryPtr /* geom */ , extern XkbShapePtr XkbAddGeomShape(XkbGeometryPtr /* geom */ ,
Atom /* name */ , Atom /* name */ ,

2
xkb/xkmread.c
View File

@ -1110,7 +1110,7 @@ ReadXkmGeometry(FILE * file, XkbDescPtr xkb)
tmp = fread(&olWire, SIZEOF(xkmOutlineDesc), 1, file); tmp = fread(&olWire, SIZEOF(xkmOutlineDesc), 1, file);
nRead += tmp * SIZEOF(xkmOutlineDesc); nRead += tmp * SIZEOF(xkmOutlineDesc);
ol = XkbAddGeomOutline(shape, olWire.num_points); ol = SrvXkbAddGeomOutline(shape, olWire.num_points);
if (!ol) { if (!ol) {
_XkbLibError(_XkbErrBadAlloc, "ReadXkmGeometry", 0); _XkbLibError(_XkbErrBadAlloc, "ReadXkmGeometry", 0);
return nRead; return nRead;