[PATCH] dix: use correct type for timestamps

Simon Thum simon.thum at gmx.de
Sun Mar 1 05:53:03 PST 2009


acceleration code did use int where CARD32 would have been correct.
---
 dix/ptrveloc.c     |    6 +++---
 include/input.h    |    2 +-
 include/ptrveloc.h |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c
index 30e0207..efe575f 100644
--- a/dix/ptrveloc.c
+++ b/dix/ptrveloc.c
@@ -534,7 +534,7 @@ ProcessVelocityData2D(
     DeviceVelocityPtr s,
     int dx,
     int dy,
-    int time)
+    CARD32 time)
 {
     float distance;
 
@@ -1042,7 +1042,7 @@ acceleratePointerPredictable(
     int first_valuator,
     int num_valuators,
     int *valuators,
-    int evtime)
+    CARD32 evtime)
 {
     float mult = 0.0;
     int dx = 0, dy = 0;
@@ -1119,7 +1119,7 @@ acceleratePointerLightweight(
     int first_valuator,
     int num_valuators,
     int *valuators,
-    int ignored)
+    CARD32 ignored)
 {
     float mult = 0.0;
     int dx = 0, dy = 0;
diff --git a/include/input.h b/include/input.h
index 3b7a173..f086aa5 100644
--- a/include/input.h
+++ b/include/input.h
@@ -140,7 +140,7 @@ typedef void (*PointerAccelSchemeProc)(
     int /*first_valuator*/,
     int /*num_valuators*/,
     int* /*valuators*/,
-    int /*evtime*/);
+    CARD32 /*evtime*/);
 
 typedef void (*DeviceCallbackProc)(
               DeviceIntPtr /*pDev*/);
diff --git a/include/ptrveloc.h b/include/ptrveloc.h
index f9933c9..0d4616a 100644
--- a/include/ptrveloc.h
+++ b/include/ptrveloc.h
@@ -126,10 +126,10 @@ AccelerationDefaultCleanup(DeviceIntPtr pDev);
 
 extern _X_EXPORT void
 acceleratePointerPredictable(DeviceIntPtr pDev, int first_valuator,
-                             int num_valuators, int *valuators, int evtime);
+                             int num_valuators, int *valuators, CARD32 evtime);
 
 extern _X_EXPORT void
 acceleratePointerLightweight(DeviceIntPtr pDev, int first_valuator,
-                         int num_valuators, int *valuators, int ignore);
+                         int num_valuators, int *valuators, CARD32 ignore);
 
 #endif  /* POINTERVELOCITY_H */
-- 
1.6.0.6


--------------080907050908080008060602--


More information about the xorg-devel mailing list