Add support for older Xorg releases.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5079 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/unix/xserver/hw/vnc/InputXKB.cc b/unix/xserver/hw/vnc/InputXKB.cc
index 39d9252c80a0766c7f79d64f10d5539afc96ff19..65c44009f306a8a4b3ecf1d35b1d6098eb1f8954 100644 (file)
--- a/unix/xserver/hw/vnc/InputXKB.cc
+++ b/unix/xserver/hw/vnc/InputXKB.cc
@@ -42,12 +42,21 @@ extern "C" {
 #undef class
 }
 
+#if XORG < 19
+static DevPrivateKey vncXkbScreenPrivateKey = &vncXkbScreenPrivateKey;
+#else
 static DevPrivateKeyRec vncXkbPrivateKeyRec;
 #define vncXkbScreenPrivateKey (&vncXkbPrivateKeyRec)
+#endif
+
 #define vncXkbScreenPrivate(pScreen) \
        (*(InputDevice**) dixLookupPrivate(&(pScreen)->devPrivates, \
                                           vncXkbScreenPrivateKey))
 
+#ifndef KEYBOARD_OR_FLOAT
+#define KEYBOARD_OR_FLOAT MASTER_KEYBOARD
+#endif
+
 /* Stolen from libX11 */
 static Bool
 XkbTranslateKeyCode(register XkbDescPtr xkb, KeyCode key,