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 3fe6d31c7bb4d08567e01a672a08d9ad21ebd600..3d36e2594494ccf6268bc05511cf877a5da916ff 100644 (file)
--- 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 115e9a2d0573470ea289945af71f2521bc43f800..c4e3a498bab6e4997e3f805d4448b2deeb86e021 100644 (file)
--- 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();