[PATCH 4/4] dix: Remove lastEventMask variable, substitute with a #define.

[Peter Hutterer]

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 dix/events.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dix/events.c b/dix/events.c
index ae566c5..4b367f7 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -183,7 +183,8 @@ typedef const char *string;
 #define AllModifiersMask ( \
 	ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | \
 	Mod3Mask | Mod4Mask | Mod5Mask )
-#define AllEventMasks (lastEventMask|(lastEventMask-1))
+#define LastEventMask OwnerGrabButtonMask
+#define AllEventMasks (LastEventMask|(LastEventMask-1))
 
 /**
  * Used to indicate a implicit passive grab created by a ButtonPress event.
@@ -338,8 +339,6 @@ static WindowPtr XYToWindow(
  */
 extern int lastEvent;
 
-static Mask lastEventMask;
-
 extern int DeviceMotionNotify;
 
 #define CantBeFiltered NoEventMask
@@ -4616,7 +4615,6 @@ InitEvents(void)
     inputInfo.off_devices = (DeviceIntPtr)NULL;
     inputInfo.keyboard = (DeviceIntPtr)NULL;
     inputInfo.pointer = (DeviceIntPtr)NULL;
-    lastEventMask = OwnerGrabButtonMask;
     /* The mask for pointer motion events may have changed in the last server
      * generation. See comment above definition of filters. */
     filters[0][PointerMotionMask] = MotionNotify;
-- 
1.6.0.6