From: Pierre Ossman <ossman@cendio.se>
Date: Tue, 6 Aug 2024 12:53:30 +0000 (+0200)
Subject: Avoid XKeysymToString() conflict with libX11
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=01cf61b4e0f4cd5031794f0a82fdf603d20a7852;p=tigervnc.git

Avoid XKeysymToString() conflict with libX11

We implement our own version of this, and because of this we carry our
lookup table generated by the same tool that libX11 uses. Unfortunately,
that table is a global symbol and as such there might be a mismatch of
which table should be used.

Make sure we get our own copy by changing the name of it. We use a
define rather than modifying ks_tables.h as that file is automatically
generated.
---

diff --git a/common/rfb/KeysymStr.c b/common/rfb/KeysymStr.c
index 51d6e897..5bdb1558 100644
--- a/common/rfb/KeysymStr.c
+++ b/common/rfb/KeysymStr.c
@@ -34,6 +34,9 @@ in this Software without prior written authorization from The Open Group.
 #include "keysymdef.h"
 #include "KeysymStr.h"
 
+/* Change the name of this to avoid conflict with libX11 */
+#define _XkeyTable _vncXkeyTable
+
 #define NEEDKTABLE
 #define NEEDVTABLE
 #include "ks_tables.h"