xserver: Branch 'master'

[Jeremy Huddleston]

 mi/mieq.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 47bf269d5922a4998c33908a53ad1affa8de96c0
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Wed Sep 3 12:54:56 2008 -0700

    mieq: Fix my broken cherry pick.

diff --git a/mi/mieq.c b/mi/mieq.c
index 48628fc..e1785a2 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -298,6 +298,7 @@ CopyGetMasterEvent(DeviceIntPtr mdev, xEvent* original,
 void
 mieqProcessInputEvents(void)
 {
+    mieqHandler handler;
     EventRec *e = NULL;
     int x = 0, y = 0;
     xEvent* event,
@@ -336,8 +337,6 @@ mieqProcessInputEvents(void)
             NewCurrentScreen (e->pDev, DequeueScreen(e->pDev), x, y);
         }
         else {
-            mieqHandler handler;
-
             /* FIXME: Bad hack. The only event where we actually get multiple
              * events at once is a DeviceMotionNotify followed by
              * DeviceValuators. For now it's safe enough to just take the