diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-16 20:50:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-16 20:50:58 +0000 |
| commit | 1c94119ae26b94a60bb2c2b33494ed43c3b8a52f (patch) | |
| tree | cfe0c736c95314edac7d9f1065be9c13026ed0c1 /xorg-server/dix/ptrveloc.c | |
| parent | 6b29aa4559aeb6f795caee047561654bfa0a1954 (diff) | |
| download | vcxsrv-1c94119ae26b94a60bb2c2b33494ed43c3b8a52f.tar.gz vcxsrv-1c94119ae26b94a60bb2c2b33494ed43c3b8a52f.tar.bz2 vcxsrv-1c94119ae26b94a60bb2c2b33494ed43c3b8a52f.zip | |
svn merge -r588:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/dix/ptrveloc.c')
| -rw-r--r-- | xorg-server/dix/ptrveloc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xorg-server/dix/ptrveloc.c b/xorg-server/dix/ptrveloc.c index ffc1a1d85..7310952c9 100644 --- a/xorg-server/dix/ptrveloc.c +++ b/xorg-server/dix/ptrveloc.c @@ -120,7 +120,7 @@ InitVelocityData(DeviceVelocityPtr vel) */
void
FreeVelocityData(DeviceVelocityPtr vel){
- xfree(vel->tracker);
+ free(vel->tracker);
SetAccelerationProfile(vel, PROFILE_UNINITIALIZE);
}
@@ -136,7 +136,7 @@ AccelerationDefaultCleanup(DeviceIntPtr dev) && dev->valuator->accelScheme.accelData != NULL){
dev->valuator->accelScheme.AccelSchemeProc = NULL;
FreeVelocityData(dev->valuator->accelScheme.accelData);
- xfree(dev->valuator->accelScheme.accelData);
+ free(dev->valuator->accelScheme.accelData);
dev->valuator->accelScheme.accelData = NULL;
DeletePredictableAccelerationProperties(dev);
}
@@ -381,8 +381,8 @@ InitTrackers(DeviceVelocityPtr vel, int ntracker) ErrorF("(dix ptracc) invalid number of trackers\n");
return;
}
- xfree(vel->tracker);
- vel->tracker = (MotionTrackerPtr)xalloc(ntracker * sizeof(MotionTracker));
+ free(vel->tracker);
+ vel->tracker = (MotionTrackerPtr)malloc(ntracker * sizeof(MotionTracker));
memset(vel->tracker, 0, ntracker * sizeof(MotionTracker));
vel->num_tracker = ntracker;
}
@@ -963,7 +963,7 @@ SetAccelerationProfile( if(vel->profile_private != NULL){
/* Here one could free old profile-private data */
- xfree(vel->profile_private);
+ free(vel->profile_private);
vel->profile_private = NULL;
}
/* Here one could init profile-private data */
|