xserver: Branch 'input-hotplug'

[Daniel Stone]

 hw/kdrive/src/kinput.c |    7 +------
 1 files changed, 1 insertion(+), 6 deletions(-)

New commits:
diff-tree 5d073697adb3864133fa3221b82ab8d2f4a59758 (from 47c1c948e69cfba950ad37a3133fa2db0bd0ff2c)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Tue Aug 15 15:37:10 2006 +0300

    kdrive/input: minor warning cleanups
    And also a compiler error fix when VERIFY_SIGIO is defined.

diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 278bbf7..68afd28 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -143,7 +143,7 @@ KdAssertSigioBlocked (char *where)
     sigprocmask (SIG_BLOCK, &set, &old);
     if (!sigismember (&old, SIGIO)) {
 	ErrorF ("SIGIO not blocked at %s\n", where);
-        KdBacktrace();
+        KdBacktrace(0);
     }
 }
 
@@ -387,7 +387,6 @@ static int
 KdPointerProc(DeviceIntPtr pDevice, int onoff)
 {
     DevicePtr       pDev = (DevicePtr)pDevice;
-    int             i;
     KdPointerInfo   *pi;
 #ifdef XINPUT
     Atom            xiclass;
@@ -716,9 +715,6 @@ KdKeyboardProc(DeviceIntPtr pDevice, int
     Bool        ret;
     DevicePtr   pDev = (DevicePtr)pDevice;
     KdKeyboardInfo *ki;
-#ifdef XKB
-    XkbComponentNamesRec names;
-#endif
 #ifdef XINPUT
     Atom xiclass;
 #endif
@@ -1254,7 +1250,6 @@ KdInitInput (void)
     KdPointerInfo *pi;
     KdKeyboardInfo *ki;
     struct KdConfigDevice *dev;
-    int i = 0;
 
     kdInputEnabled = TRUE;