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

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 50616660c..44143eb6f 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -819,7 +819,7 @@ XkbAddGeomOverlayKey(XkbOverlayPtr overlay,
 }
 
 XkbOverlayRowPtr
-XkbAddGeomOverlayRow(XkbOverlayPtr overlay, int row_under, int sz_keys)
+SrvXkbAddGeomOverlayRow(XkbOverlayPtr overlay, int row_under, int sz_keys)
 {
     register int i;
     XkbOverlayRowPtr row;
diff --git a/xkb/xkb.c b/xkb/xkb.c
index 91a594c5f..a411e46f3 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -5305,7 +5305,7 @@ _CheckSetOverlay(char **wire_inout, xkbSetGeometryReq *req,
                                               rWire->rowUnder);
             return BadMatch;
         }
-        row = XkbAddGeomOverlayRow(ol, rWire->rowUnder, rWire->nKeys);
+        row = SrvXkbAddGeomOverlayRow(ol, rWire->rowUnder, rWire->nKeys);
         kWire = (xkbOverlayKeyWireDesc *) &rWire[1];
         for (k = 0; k < rWire->nKeys; k++, kWire++) {
             if (!_XkbCheckRequestBounds(client, req, kWire, kWire + 1))
diff --git a/xkb/xkbgeom.h b/xkb/xkbgeom.h
index c08e1ea9c..63bb44766 100644
--- a/xkb/xkbgeom.h
+++ b/xkb/xkbgeom.h
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "xkbstr.h"
 
-#define XkbAddGeomOverlayRow		SrvXkbAddGeomOverlayRow
 #define	XkbAddGeomOverlayKey		SrvXkbAddGeomOverlayKey
 #define XkbAddGeomProperty		SrvXkbAddGeomProperty
 #define XkbAddGeomRow			SrvXkbAddGeomRow
@@ -343,10 +342,9 @@ XkbOverlayPtr SrvXkbAddGeomOverlay(XkbSectionPtr section,
                                    Atom name,
                                    int sz_rows);
 
-extern XkbOverlayRowPtr XkbAddGeomOverlayRow(XkbOverlayPtr /* overlay */ ,
-                                             int /* row_under */ ,
-                                             int        /* sz_keys */
-    );
+XkbOverlayRowPtr SrvXkbAddGeomOverlayRow(XkbOverlayPtr overlay,
+                                         int row_under,
+                                         int sz_keys);
 
 extern XkbOverlayKeyPtr XkbAddGeomOverlayKey(XkbOverlayPtr /* overlay */ ,
                                              XkbOverlayRowPtr /* row */ ,
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index ca15a5d84..02e448396 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -935,7 +935,7 @@ ReadXkmGeomOverlay(FILE * file, XkbGeometryPtr geom, XkbSectionPtr section)
 
         tmp = fread(&rowWire, SIZEOF(xkmOverlayRowDesc), 1, file);
         nRead += tmp * SIZEOF(xkmOverlayRowDesc);
-        row = XkbAddGeomOverlayRow(ol, rowWire.row_under, rowWire.num_keys);
+        row = SrvXkbAddGeomOverlayRow(ol, rowWire.row_under, rowWire.num_keys);
         if (!row) {
             _XkbLibError(_XkbErrBadAlloc, "ReadXkmGeomOverlay", 0);
             return nRead;