diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-11-05 19:08:36 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-11-05 19:08:36 -0500 |
| commit | a52c9b2a59f27266557ff9d5d2c08492e04135a6 (patch) | |
| tree | 705f11c54e8a31a07dde9ab6835032e2849e132b /Xi | |
| parent | c7e18beb3c87eb1ada9b21c4ffacd11c1939c087 (diff) | |
| parent | 58332894c061ae96d6a457f65266660f5f65e88b (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/dispatch.c
dix/property.c
hw/xfree86/common/xf86VidMode.c
include/xkbsrv.h
render/glyph.c
xkb/xkbActions.c
Diffstat (limited to 'Xi')
| -rw-r--r-- | Xi/gtmotion.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Xi/gtmotion.c b/Xi/gtmotion.c index de22d0484..4f4d7cb77 100644 --- a/Xi/gtmotion.c +++ b/Xi/gtmotion.c @@ -134,7 +134,7 @@ ProcXGetDeviceMotionEvents(ClientPtr client) if (num_events) { size = sizeof(Time) + (axes * sizeof(INT32)); tsize = num_events * size; - coords = (INT32 *) ALLOCATE_LOCAL(tsize); + coords = (INT32 *) xalloc(tsize); if (!coords) return BadAlloc; rep.nEvents = (v->GetMotionProc) (dev, (xTimecoord *) coords, /* XXX */ @@ -160,7 +160,7 @@ ProcXGetDeviceMotionEvents(ClientPtr client) WriteToClient(client, length * 4, (char *)coords); } if (coords) - DEALLOCATE_LOCAL(coords); + xfree(coords); return Success; } |