Revision: 4224
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4224&view=rev
Author: atkac
Date: 2010-12-08 16:26:29 +0000 (Wed, 08 Dec 2010)
Log Message:
-----------
[Bugfix] Fix various compilation warnings.
Modified Paths:
--------------
trunk/unix/xserver/hw/vnc/Input.cc
trunk/unix/xserver/hw/vnc/xvnc.cc
Modified: trunk/unix/xserver/hw/vnc/Input.cc
===================================================================
--- trunk/unix/xserver/hw/vnc/Input.cc 2010-12-08 16:19:51 UTC (rev 4223)
+++ trunk/unix/xserver/hw/vnc/Input.cc 2010-12-08 16:26:29 UTC (rev 4224)
@@ -325,9 +325,8 @@
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 @@
int state, maxKeysPerMod;
KeyClassPtr keyc;
#if XORG >= 17
- int ret;
KeyCode *modmap = NULL;
keyc = dev->u.master->key;
@@ -511,7 +509,9 @@
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 @@
return 0;
}
+#if XORG < 17
/* Fairly standard US PC Keyboard */
#define MIN_KEY 8
@@ -962,6 +963,7 @@
return TRUE;
}
+#endif
static void keyboardBell(int percent, DeviceIntPtr device, pointer ctrl,
int class_)
@@ -972,8 +974,10 @@
static int keyboardProc(DeviceIntPtr pDevice, int onoff)
{
+#if XORG < 17
KeySymsRec keySyms;
CARD8 modMap[MAP_LENGTH];
+#endif
DevicePtr pDev = (DevicePtr)pDevice;
switch (onoff) {
Modified: trunk/unix/xserver/hw/vnc/xvnc.cc
===================================================================
--- trunk/unix/xserver/hw/vnc/xvnc.cc 2010-12-08 16:19:51 UTC (rev 4223)
+++ trunk/unix/xserver/hw/vnc/xvnc.cc 2010-12-08 16:26:29 UTC (rev 4224)
@@ -166,7 +166,6 @@
static Bool Render = TRUE;
static bool displaySpecified = false;
-static bool wellKnownSocketsCreated = false;
static char displayNumStr[16];
char *listenaddr = NULL;
@@ -838,7 +837,6 @@
static Bool vncRandRGetInfo (ScreenPtr pScreen, Rotation *rotations)
{
- vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum];
Bool ret, gotCurrent = FALSE;
int i;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF Dev2Dev email is sponsored by:
WikiLeaks The End of the Free Internet
http://p.sf.net/sfu/therealnews-com
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
