From 9bcc5de027f014aa1c0227af513190fdba542515 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 28 Feb 2025 17:46:42 +0100
Subject: [PATCH] xkb: rename XkbAddGeomShape() to SrvXkbAddGeomShape()

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>
---
 xkb/XKBGAlloc.c | 2 +-
 xkb/xkb.c       | 2 +-
 xkb/xkbgeom.h   | 8 +++-----
 xkb/xkmread.c   | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c
index 76d05bc30..4a06416d1 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -649,7 +649,7 @@ SrvXkbAddGeomOutline(XkbShapePtr shape, int sz_points)
 }
 
 XkbShapePtr
-XkbAddGeomShape(XkbGeometryPtr geom, Atom name, int sz_outlines)
+SrvXkbAddGeomShape(XkbGeometryPtr geom, Atom name, int sz_outlines)
 {
     XkbShapePtr shape;
     register int i;
diff --git a/xkb/xkb.c b/xkb/xkb.c
index c83a376ae..d808d9f4c 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -5464,7 +5464,7 @@ _CheckSetShapes(XkbGeometryPtr geom,
                 return BadLength;
 
             shape =
-                XkbAddGeomShape(geom, shapeWire->name, shapeWire->nOutlines);
+                SrvXkbAddGeomShape(geom, shapeWire->name, shapeWire->nOutlines);
             if (!shape)
                 return BadAlloc;
             olWire = (xkbOutlineWireDesc *) (&shapeWire[1]);
diff --git a/xkb/xkbgeom.h b/xkb/xkbgeom.h
index 49f94d6ff..539593da3 100644
--- a/xkb/xkbgeom.h
+++ b/xkb/xkbgeom.h
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "xkbstr.h"
 
-#define XkbAddGeomShape			SrvXkbAddGeomShape
 #define XkbAllocGeometry		SrvXkbAllocGeometry
 #define XkbFreeGeomKeyAliases		SrvXkbFreeGeomKeyAliases
 #define XkbFreeGeomColors		SrvXkbFreeGeomColors
@@ -315,10 +314,9 @@ XkbColorPtr SrvXkbAddGeomColor(XkbGeometryPtr geom,
 
 XkbOutlinePtr SrvXkbAddGeomOutline(XkbShapePtr shape, int sz_points);
 
-extern XkbShapePtr XkbAddGeomShape(XkbGeometryPtr /* geom */ ,
-                                   Atom /* name */ ,
-                                   int  /* sz_outlines */
-    );
+XkbShapePtr SrvXkbAddGeomShape(XkbGeometryPtr geom,
+                               Atom name,
+                               int sz_outlines);
 
 XkbKeyPtr SrvXkbAddGeomKey(XkbRowPtr row);
 XkbRowPtr SrvXkbAddGeomRow(XkbSectionPtr section, int sz_keys);
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index cbf907394..1fbbad380 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -1099,7 +1099,7 @@ ReadXkmGeometry(FILE * file, XkbDescPtr xkb)
             nameAtom = XkbInternAtom(buf, FALSE);
             tmp = fread(&shapeWire, SIZEOF(xkmShapeDesc), 1, file);
             nRead += tmp * SIZEOF(xkmShapeDesc);
-            shape = XkbAddGeomShape(geom, nameAtom, shapeWire.num_outlines);
+            shape = SrvXkbAddGeomShape(geom, nameAtom, shapeWire.num_outlines);
             if (!shape) {
                 _XkbLibError(_XkbErrBadAlloc, "ReadXkmGeometry", 0);
                 return nRead;