From: Pierre Ossman <ossman@cendio.se>
Date: Sun, 11 Jul 2021 17:20:48 +0000 (+0200)
Subject: Move ddxInputThreadInit() to xvnc.c
X-Git-Tag: v1.11.90~28^2~19
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=12c0f326e1d0f2d89881fe0ca04a2e2227b8e502;p=tigervnc.git

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

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();