From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 11 Apr 2013 13:50:32 +0000 (+0000)
Subject: Add support for older Xorg releases.
X-Git-Tag: v1.2.90~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c8f3d5518c03f5779fca7f70978685e3eb1879c0;p=tigervnc.git

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 39d9252c..65c44009 100644
--- 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,