diff options
author | marha <marha@users.sourceforge.net> | 2011-12-23 10:01:52 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-12-23 10:01:52 +0100 |
commit | e22891346b85a7db40dec7260a100f90b451cbc8 (patch) | |
tree | a7dd2d6757253947bcc821abbf68fd24d3301e89 /xorg-server/hw/kdrive/linux/ps2.c | |
parent | abacebe06d9f3d2fe1b7d256bd86cddbfa592a85 (diff) | |
download | vcxsrv-e22891346b85a7db40dec7260a100f90b451cbc8.tar.gz vcxsrv-e22891346b85a7db40dec7260a100f90b451cbc8.tar.bz2 vcxsrv-e22891346b85a7db40dec7260a100f90b451cbc8.zip |
git mesa pixman xserver xkeyboard-config update 24 dec 2011
Diffstat (limited to 'xorg-server/hw/kdrive/linux/ps2.c')
-rw-r--r-- | xorg-server/hw/kdrive/linux/ps2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/kdrive/linux/ps2.c b/xorg-server/hw/kdrive/linux/ps2.c index 465b963f2..b62d769f2 100644 --- a/xorg-server/hw/kdrive/linux/ps2.c +++ b/xorg-server/hw/kdrive/linux/ps2.c @@ -159,7 +159,7 @@ Ps2Enable (KdPointerInfo *pi) return BadAlloc; } - pi->driverPrivate = (void *)fd; + pi->driverPrivate = (void *)(intptr_t)fd; return Success; } @@ -168,7 +168,7 @@ Ps2Enable (KdPointerInfo *pi) static void Ps2Disable (KdPointerInfo *pi) { - KdUnregisterFd (pi, (int)pi->driverPrivate, TRUE); + KdUnregisterFd (pi, (int)(intptr_t)pi->driverPrivate, TRUE); } static void |