diff options
| author | Pierre Ossman <ossman@cendio.se> | 2016-04-15 11:14:14 +0200 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2016-04-15 11:14:14 +0200 |
| commit | d9d0a97126db6e8ea40094748361664ae538bab0 (patch) | |
| tree | f5994a264c729fd08c64177a310e7bf5c17d2e69 /unix/xserver/hw/vnc/InputXKB.c | |
| parent | 960e7e1b6db530480fc28d91ed71037166451d1c (diff) | |
| download | tigervnc-d9d0a97126db6e8ea40094748361664ae538bab0.tar.gz tigervnc-d9d0a97126db6e8ea40094748361664ae538bab0.zip | |
Avoid calling GetMaster() with old Xorg
GetMaster() wasn't exported until Xorg 1.18 so it is unsafe to use
from libvnc.so for older versions.
Diffstat (limited to 'unix/xserver/hw/vnc/InputXKB.c')
| -rw-r--r-- | unix/xserver/hw/vnc/InputXKB.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/unix/xserver/hw/vnc/InputXKB.c b/unix/xserver/hw/vnc/InputXKB.c index 490d6d19..2a3f7afb 100644 --- a/unix/xserver/hw/vnc/InputXKB.c +++ b/unix/xserver/hw/vnc/InputXKB.c @@ -42,6 +42,10 @@ #define KEYBOARD_OR_FLOAT MASTER_KEYBOARD #endif +#if XORG < 118 +#define GetMaster(dev, type) ((dev)->master) +#endif + extern DeviceIntPtr vncKeyboardDev; static void vncXkbProcessDeviceEvent(int screenNum, |