[Bugfix] Fix various compilation warnings.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4224 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/unix/xserver/hw/vnc/Input.cc b/unix/xserver/hw/vnc/Input.cc
index e23f3d37d593cbb3e936b778b6d7fb246052c6d0..c0e28bcc08b92a43522f6ba8ca66b31cd3151fad 100644 (file)
--- a/unix/xserver/hw/vnc/Input.cc
+++ b/unix/xserver/hw/vnc/Input.cc
@@ -325,9 +325,8 @@ public:
 
        void press()
        {
-               int state, index, maxKeysPerMod, keycode;
+               int state, maxKeysPerMod, keycode;
 #if XORG >= 17
-               int ret;
                KeyCode *modmap = NULL;
 
                state = XkbStateFieldFromRec(&dev->u.master->key->xkbInfo->state);
@@ -360,7 +359,6 @@ public:
                int state, maxKeysPerMod;
                KeyClassPtr keyc;
 #if XORG >= 17
-               int ret;
                KeyCode *modmap = NULL;
 
                keyc = dev->u.master->key;
@@ -511,7 +509,9 @@ static struct altKeysym_t {
 
 void InputDevice::keyEvent(rdr::U32 keysym, bool down)
 {
+#if XORG < 17
        DeviceIntPtr master;
+#endif
        KeyClassPtr keyc;
        KeySymsPtr keymap = NULL;
        KeySym *map = NULL;
@@ -795,6 +795,7 @@ static KeyCode KeysymToKeycode(KeySymsPtr keymap, KeySym ks, int* col)
        return 0;
 }
 
+#if XORG < 17
 /* Fairly standard US PC Keyboard */
 
 #define MIN_KEY 8
@@ -962,6 +963,7 @@ static Bool GetMappings(KeySymsPtr pKeySyms, CARD8 *pModMap)
 
        return TRUE;
 }
+#endif
 
 static void keyboardBell(int percent, DeviceIntPtr device, pointer ctrl,
                         int class_)
@@ -972,8 +974,10 @@ static void keyboardBell(int percent, DeviceIntPtr device, pointer ctrl,
 
 static int keyboardProc(DeviceIntPtr pDevice, int onoff)
 {
+#if XORG < 17
        KeySymsRec keySyms;
        CARD8 modMap[MAP_LENGTH];
+#endif
        DevicePtr pDev = (DevicePtr)pDevice;
 
        switch (onoff) {

diff --git a/unix/xserver/hw/vnc/xvnc.cc b/unix/xserver/hw/vnc/xvnc.cc
index cc15d79f6dec540b77086fb58afd813d4666fcef..56912f9059bbd2ac57855a4a5d39b8f3a468176a 100644 (file)
--- a/unix/xserver/hw/vnc/xvnc.cc
+++ b/unix/xserver/hw/vnc/xvnc.cc
@@ -166,7 +166,6 @@ static int lastScreen = -1;
 static Bool Render = TRUE;
 
 static bool displaySpecified = false;
-static bool wellKnownSocketsCreated = false;
 static char displayNumStr[16];
 
 char *listenaddr = NULL;
@@ -838,7 +837,6 @@ static miPointerScreenFuncRec vfbPointerCursorFuncs = {
 
 static Bool vncRandRGetInfo (ScreenPtr pScreen, Rotation *rotations)
 {
-  vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum];
   Bool ret, gotCurrent = FALSE;
   int i;