summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2007-09-13 23:22:27 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2007-09-24 12:37:33 +0930
commit1c25c46f3d5f98be8dbf36684aad4302b220e163 (patch)
treeeda43925f84bc9a2e886ade332d2e8fd6099af96
parent68e0c4988e359e3c9da933946bc703cf8530bdbc (diff)
dix: fix compiler warnings about unused variables.
-rw-r--r--dix/events.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/dix/events.c b/dix/events.c
index 3d833ef95..aab535234 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -777,8 +777,9 @@ ConfineToShape(DeviceIntPtr pDev, RegionPtr shape, int *px, int *py)
BoxRec box;
int x = *px, y = *py;
int incx = 1, incy = 1;
- SpritePtr pSprite = pDev->spriteInfo->sprite;
+ SpritePtr pSprite;
+ pSprite = pDev->spriteInfo->sprite;
if (POINT_IN_REGION(pSprite->hot.pScreen, shape, x, y, &box))
return;
box = *REGION_EXTENTS(pSprite->hot.pScreen, shape);
@@ -3488,16 +3489,14 @@ ProcessKeyboardEvent (xEvent *xE, DeviceIntPtr keybd, int count)
#endif
{
int key, bit;
- BYTE *kptr;
- int i;
- CARD8 modifiers;
- CARD16 mask;
+ BYTE *kptr;
+ CARD8 modifiers;
GrabPtr grab;
GrabInfoPtr grabinfo;
Bool deactivateGrab = FALSE;
- KeyClassPtr keyc = keybd->key;
+ KeyClassPtr keyc = keybd->key;
#ifdef XEVIE
- static Window rootWin = 0;
+ static Window rootWin = 0;
if(!xeviegrabState && xevieFlag && clients[xevieClientIndex] &&
(xevieMask & xevieFilters[xE->u.u.type])) {