From 2a4410a655e735168046a6f80c6a6266c91aa006 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 28 Feb 2025 16:58:50 +0100
Subject: [PATCH] xkb: rename XkbAddGeomColor() to SrvXkbAddGeomColor()

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 68a9fc184..5e59632de 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -603,7 +603,7 @@ SrvXkbAddGeomKeyAlias(XkbGeometryPtr geom, char *aliasStr, char *realStr)
 }
 
 XkbColorPtr
-XkbAddGeomColor(XkbGeometryPtr geom, char *spec, unsigned int pixel)
+SrvXkbAddGeomColor(XkbGeometryPtr geom, char *spec, unsigned int pixel)
 {
     register int i;
     register XkbColorPtr color;
diff --git a/xkb/xkb.c b/xkb/xkb.c
index 2d7387c74..74450b8d5 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -5570,7 +5570,7 @@ _CheckSetGeom(XkbGeometryPtr geom, xkbSetGeometryReq * req, ClientPtr client)
         status = _GetCountedString(&wire, client, &name);
         if (status != Success)
             return status;
-        if (!XkbAddGeomColor(geom, name, geom->num_colors)) {
+        if (!SrvXkbAddGeomColor(geom, name, geom->num_colors)) {
             free(name);
             return BadAlloc;
         }
diff --git a/xkb/xkbgeom.h b/xkb/xkbgeom.h
index 9f8f60010..af40d12bd 100644
--- a/xkb/xkbgeom.h
+++ b/xkb/xkbgeom.h
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "xkbstr.h"
 
-#define XkbAddGeomColor 		SrvXkbAddGeomColor
 #define XkbAddGeomDoodad		SrvXkbAddGeomDoodad
 #define XkbAddGeomKey			SrvXkbAddGeomKey
 #define XkbAddGeomOutline		SrvXkbAddGeomOutline
@@ -320,10 +319,9 @@ XkbKeyAliasPtr SrvXkbAddGeomKeyAlias(XkbGeometryPtr geom,
                                      char *alias,
                                      char *real);
 
-extern XkbColorPtr XkbAddGeomColor(XkbGeometryPtr /* geom */ ,
-                                   char * /* spec */ ,
-                                   unsigned int /* pixel */
-    );
+XkbColorPtr SrvXkbAddGeomColor(XkbGeometryPtr geom,
+                               char *spec,
+                               unsigned int pixel);
 
 extern XkbOutlinePtr XkbAddGeomOutline(XkbShapePtr /* shape */ ,
                                        int      /* sz_points */
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index cdcb443ba..b1af821db 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -1077,7 +1077,7 @@ ReadXkmGeometry(FILE * file, XkbDescPtr xkb)
     if (wireGeom.num_colors > 0) {
         for (i = 0; i < wireGeom.num_colors; i++) {
             nRead += XkmGetCountedString(file, buf, 100);
-            if (XkbAddGeomColor(geom, buf, i) == NULL) {
+            if (SrvXkbAddGeomColor(geom, buf, i) == NULL) {
                 _XkbLibError(_XkbErrBadAlloc, "ReadXkmGeometry", 0);
                 return nRead;
             }