From bda93857c8f945421278c4ea23cb218cf677419e Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Tue, 6 Aug 2024 14:53:30 +0200 Subject: [PATCH] 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. (cherry picked from commit 01cf61b4e0f4cd5031794f0a82fdf603d20a7852) --- common/rfb/KeysymStr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/rfb/KeysymStr.c b/common/rfb/KeysymStr.c index 51d6e897b6..5bdb15583c 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"