From 12c0f326e1d0f2d89881fe0ca04a2e2227b8e502 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Sun, 11 Jul 2021 19:20:48 +0200 Subject: [PATCH] Move ddxInputThreadInit() to xvnc.c This should only be in the ddx parts of an X server, and Input.c is used by libvnc.so as well and can cause conflicts there. --- unix/xserver/hw/vnc/Input.c | 9 --------- unix/xserver/hw/vnc/xvnc.c | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/unix/xserver/hw/vnc/Input.c b/unix/xserver/hw/vnc/Input.c index 3fe6d31c..3d36e259 100644 --- a/unix/xserver/hw/vnc/Input.c +++ b/unix/xserver/hw/vnc/Input.c @@ -642,12 +642,3 @@ static void vncKeysymKeyboardEvent(KeySym keysym, int down) */ mieqProcessInputEvents(); } - -#if INPUTTHREAD -/** This function is called in Xserver/os/inputthread.c when starting - the input thread. */ -void -ddxInputThreadInit(void) -{ -} -#endif diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c index 115e9a2d..c4e3a498 100644 --- a/unix/xserver/hw/vnc/xvnc.c +++ b/unix/xserver/hw/vnc/xvnc.c @@ -274,6 +274,15 @@ void ddxBeforeReset(void) } #endif +#if INPUTTHREAD +/** This function is called in Xserver/os/inputthread.c when starting + the input thread. */ +void +ddxInputThreadInit(void) +{ +} +#endif + void ddxUseMsg(void) { vncPrintBanner(); -- 2.39.5