diff options
author | Keith Packard <keithp@keithp.com> | 2012-12-19 12:21:31 -0800 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2012-12-19 12:22:03 -0800 |
commit | 0eb1559eb29d11e63c2b33e317590a88d86fe313 (patch) | |
tree | 6d5956d8dd1ad6f87cd3b410c6a6049c1981004a /dix/devices.c | |
parent | 386e4d76baaffe226d2d561ff936509454eb0ac2 (diff) | |
parent | ea1d76d1b68c7cbcedcaa1f967c5027e0cc1c7a2 (diff) |
Merge remote-tracking branch 'yselkowitz/master'
I checked this patch with diff -w to check that it only affected
whitespace.
Diffstat (limited to 'dix/devices.c')
-rw-r--r-- | dix/devices.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dix/devices.c b/dix/devices.c index 613323fa2..3c7d480c6 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -283,7 +283,7 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart) dev->coreEvents = TRUE; /* sprite defaults */ - dev->spriteInfo = (SpriteInfoPtr) & dev[1]; + dev->spriteInfo = (SpriteInfoPtr) &dev[1]; /* security creation/labeling check */ @@ -944,7 +944,7 @@ CloseDevice(DeviceIntPtr dev) free(dev->name); - classes = (ClassesPtr) & dev->key; + classes = (ClassesPtr) &dev->key; FreeAllDeviceClasses(classes); if (IsMaster(dev)) { |