From: Pierre Ossman <ossman@cendio.se>
Date: Fri, 15 Apr 2016 09:14:14 +0000 (+0200)
Subject: Avoid calling GetMaster() with old Xorg
X-Git-Tag: v1.6.90~29
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d9d0a97126db6e8ea40094748361664ae538bab0;p=tigervnc.git

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.
---

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,