Skip to content

Commit bda9385

Browse files
CendioOssmanLMattsson
authored andcommitted
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 01cf61b)
1 parent 2464b5f commit bda9385

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

common/rfb/KeysymStr.c

+3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ in this Software without prior written authorization from The Open Group.
3434
#include "keysymdef.h"
3535
#include "KeysymStr.h"
3636

37+
/* Change the name of this to avoid conflict with libX11 */
38+
#define _XkeyTable _vncXkeyTable
39+
3740
#define NEEDKTABLE
3841
#define NEEDVTABLE
3942
#include "ks_tables.h"

0 commit comments

Comments
 (0)