Skip to content

Commit

Permalink
Avoid XKeysymToString() conflict with libX11
Browse files Browse the repository at this point in the history
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 01cf61b)
  • Loading branch information
CendioOssman authored and LMattsson committed Oct 18, 2024
1 parent 2464b5f commit bda9385
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions common/rfb/KeysymStr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit bda9385

Please sign in to comment.