diff options
| -rw-r--r-- | unix/xserver/hw/vnc/Input.c | 32 | ||||
| -rw-r--r-- | unix/xserver/hw/vnc/InputXKB.c | 4 |
2 files changed, 20 insertions, 16 deletions
diff --git a/unix/xserver/hw/vnc/Input.c b/unix/xserver/hw/vnc/Input.c index a50f33a8..5c458f5d 100644 --- a/unix/xserver/hw/vnc/Input.c +++ b/unix/xserver/hw/vnc/Input.c @@ -139,6 +139,22 @@ void vncInitInputDevice(void) vncPrepareInputDevices(); } +#if XORG < 111 +static void enqueueEvents(DeviceIntPtr dev, int n) +{ + int i; + + for (i = 0; i < n; i++) { + /* + * Passing arguments in global variable eventq is probably not + * good programming practise but in this case it is safe and + * clear. + */ + mieqEnqueue(dev, (InternalEvent *) (eventq + i)->event); + } +} +#endif /* XORG < 111 */ + void vncPointerButtonAction(int buttonMask) { int i; @@ -226,22 +242,6 @@ void vncGetPointerPos(int *x, int *y) *y = cursorPosY; } -#if XORG < 111 -static void enqueueEvents(DeviceIntPtr dev, int n) -{ - int i; - - for (i = 0; i < n; i++) { - /* - * Passing arguments in global variable eventq is probably not - * good programming practise but in this case it is safe and - * clear. - */ - mieqEnqueue(dev, (InternalEvent *) (eventq + i)->event); - } -} -#endif /* XORG < 111 */ - static int vncPointerProc(DeviceIntPtr pDevice, int onoff) { BYTE map[BUTTONS + 1]; diff --git a/unix/xserver/hw/vnc/InputXKB.c b/unix/xserver/hw/vnc/InputXKB.c index a9bd11d1..50a21309 100644 --- a/unix/xserver/hw/vnc/InputXKB.c +++ b/unix/xserver/hw/vnc/InputXKB.c @@ -43,8 +43,12 @@ #endif #if XORG < 118 +#if XORG < 110 +#define GetMaster(dev, type) ((dev)->u.master) +#else #define GetMaster(dev, type) ((dev)->master) #endif +#endif extern DeviceIntPtr vncKeyboardDev; |