frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kdrive/linux: Fix compilation with -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast 

Reported-by: Arkadiusz Miśkiewicz <arekm@maven.pl>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
This commit is contained in:
Jeremy Huddleston 2011-12-17 12:56:59 -08:00
parent d0170d54c7
commit 1deede3c48
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/kdrive/linux/keyboard.c
View File

@ -692,7 +692,7 @@ LinuxKeyboardEnable (KdKeyboardInfo *ki)
return !Success; return !Success;
fd = LinuxConsoleFd; fd = LinuxConsoleFd;
ki->driverPrivate = (void *) fd; ki->driverPrivate = (void *) (intptr_t) fd;
ioctl (fd, KDGKBMODE, &LinuxKbdTrans); ioctl (fd, KDGKBMODE, &LinuxKbdTrans);
tcgetattr (fd, &LinuxTermios); tcgetattr (fd, &LinuxTermios);
@ -724,7 +724,7 @@ LinuxKeyboardDisable (KdKeyboardInfo *ki)
if (!ki) if (!ki)
return; return;
fd = (int) ki->driverPrivate; fd = (int) (intptr_t) ki->driverPrivate;
KdUnregisterFd(ki, fd, FALSE); KdUnregisterFd(ki, fd, FALSE);
ioctl(fd, KDSKBMODE, LinuxKbdTrans); ioctl(fd, KDSKBMODE, LinuxKbdTrans);
@ -753,7 +753,7 @@ LinuxKeyboardLeds (KdKeyboardInfo *ki, int leds)
if (!ki) if (!ki)
return; return;
ioctl ((int)ki->driverPrivate, KDSETLED, leds & 7); ioctl ((int)(intptr_t)ki->driverPrivate, KDSETLED, leds & 7);
} }
KdKeyboardDriver LinuxKeyboardDriver = { KdKeyboardDriver LinuxKeyboardDriver = {

4
hw/kdrive/linux/ms.c
View File

@ -152,7 +152,7 @@ MsEnable (KdPointerInfo *pi)
} }
if (KdRegisterFd (port, MsRead, pi)) if (KdRegisterFd (port, MsRead, pi))
return TRUE; return TRUE;
pi->driverPrivate = (void *)port; pi->driverPrivate = (void *)(intptr_t)port;
return Success; return Success;
@ -164,7 +164,7 @@ MsEnable (KdPointerInfo *pi)
static void static void
MsDisable (KdPointerInfo *pi) MsDisable (KdPointerInfo *pi)
{ {
KdUnregisterFd (pi, (int)pi->driverPrivate, TRUE); KdUnregisterFd (pi, (int)(intptr_t)pi->driverPrivate, TRUE);
} }
static void static void

4
hw/kdrive/linux/ps2.c
View File

@ -159,7 +159,7 @@ Ps2Enable (KdPointerInfo *pi)
return BadAlloc; return BadAlloc;
} }
pi->driverPrivate = (void *)fd; pi->driverPrivate = (void *)(intptr_t)fd;
return Success; return Success;
} }
@ -168,7 +168,7 @@ Ps2Enable (KdPointerInfo *pi)
static void static void
Ps2Disable (KdPointerInfo *pi) Ps2Disable (KdPointerInfo *pi)
{ {
KdUnregisterFd (pi, (int)pi->driverPrivate, TRUE); KdUnregisterFd (pi, (int)(intptr_t)pi->driverPrivate, TRUE);
} }
static void static void