xserver: Branch 'mpx'

[Peter Hutterer]

 dix/getevents.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit fea39c94bcc8b635d37530d8a27ee92acab484fe
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Wed Apr 30 13:17:14 2008 +0930

    dix: fix typo from last commit.

diff --git a/dix/getevents.c b/dix/getevents.c
index a358bb3..6f25fe8 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -356,17 +356,17 @@ acceleratePointer(DeviceIntPtr pDev, int first_valuator, int num_valuators,
 static void
 clipAxis(DeviceIntPtr pDev, int axisNum, int *val)
 {
-    AxisInfoPtr axes = pDev->valuator->axes + axisNum;
+    AxisInfoPtr axis = pDev->valuator->axes + axisNum;
 
     /* InitValuatoraAxisStruct ensures that (min < max) */
 
-    if (axes->min_value != NO_AXIS_LIMITS &&
+    if (axis->min_value != NO_AXIS_LIMITS &&
             *val < axis->min_value)
-        *val = axes->min_value;
+        *val = axis->min_value;
 
-    if (axes->max_value != NO_AXIS_LIMITS &&
-            *val > axes->max_value)
-        *val = axes->max_value;
+    if (axis->max_value != NO_AXIS_LIMITS &&
+            *val > axis->max_value)
+        *val = axis->max_value;
 }
 
 /**