From d9d0a97126db6e8ea40094748361664ae538bab0 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Fri, 15 Apr 2016 11:14:14 +0200 Subject: [PATCH] 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. --- unix/xserver/hw/vnc/InputXKB.c | 4 ++++ 1 file changed, 4 insertions(+) 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, -- 2.39.5