From d0e2eb40159a9b53a4e1a9615bab92ff9b449bf8 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 28 Feb 2025 17:25:54 +0100
Subject: [PATCH] xkb: rename XkbAddGeomOverlay() to SrvXkbAddGeomOverlay()

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 0ec321c82..50616660c 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -851,7 +851,7 @@ XkbAddGeomOverlayRow(XkbOverlayPtr overlay, int row_under, int sz_keys)
 }
 
 XkbOverlayPtr
-XkbAddGeomOverlay(XkbSectionPtr section, Atom name, int sz_rows)
+SrvXkbAddGeomOverlay(XkbSectionPtr section, Atom name, int sz_rows)
 {
     register int i;
     XkbOverlayPtr overlay;
diff --git a/xkb/xkb.c b/xkb/xkb.c
index 675616b1b..91a594c5f 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -5290,7 +5290,7 @@ _CheckSetOverlay(char **wire_inout, xkbSetGeometryReq *req,
         swapl(&olWire->name);
     }
     CHK_ATOM_ONLY(olWire->name);
-    ol = XkbAddGeomOverlay(section, olWire->name, olWire->nRows);
+    ol = SrvXkbAddGeomOverlay(section, olWire->name, olWire->nRows);
     rWire = (xkbOverlayRowWireDesc *) &olWire[1];
     for (r = 0; r < olWire->nRows; r++) {
         register int k;
diff --git a/xkb/xkbgeom.h b/xkb/xkbgeom.h
index e05e56e8b..c08e1ea9c 100644
--- a/xkb/xkbgeom.h
+++ b/xkb/xkbgeom.h
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "xkbstr.h"
 
-#define XkbAddGeomOverlay		SrvXkbAddGeomOverlay
 #define XkbAddGeomOverlayRow		SrvXkbAddGeomOverlayRow
 #define	XkbAddGeomOverlayKey		SrvXkbAddGeomOverlayKey
 #define XkbAddGeomProperty		SrvXkbAddGeomProperty
@@ -340,10 +339,9 @@ extern XkbSectionPtr XkbAddGeomSection(XkbGeometryPtr /* geom */ ,
                                        int      /* sz_overlays */
     );
 
-extern XkbOverlayPtr XkbAddGeomOverlay(XkbSectionPtr /* section */ ,
-                                       Atom /* name */ ,
-                                       int      /* sz_rows */
-    );
+XkbOverlayPtr SrvXkbAddGeomOverlay(XkbSectionPtr section,
+                                   Atom name,
+                                   int sz_rows);
 
 extern XkbOverlayRowPtr XkbAddGeomOverlayRow(XkbOverlayPtr /* overlay */ ,
                                              int /* row_under */ ,
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index 208bc15c5..ca15a5d84 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -926,7 +926,7 @@ ReadXkmGeomOverlay(FILE * file, XkbGeometryPtr geom, XkbSectionPtr section)
     nRead += XkmGetCountedString(file, buf, 100);
     tmp = fread(&olWire, SIZEOF(xkmOverlayDesc), 1, file);
     nRead += tmp * SIZEOF(xkmOverlayDesc);
-    ol = XkbAddGeomOverlay(section, XkbInternAtom(buf, FALSE), olWire.num_rows);
+    ol = SrvXkbAddGeomOverlay(section, XkbInternAtom(buf, FALSE), olWire.num_rows);
     if (!ol)
         return nRead;
     for (r = 0; r < olWire.num_rows; r++) {