diff options
author | BlackNoxis <steven.darklight@gmail.com> | 2014-02-15 23:24:26 +0200 |
---|---|---|
committer | BlackNoxis <steven.darklight@gmail.com> | 2014-02-15 23:24:26 +0200 |
commit | 7224c1253228e5c29c78cb3f0f26ce34770f2356 (patch) | |
tree | 1684924656132935256e034f35f92abee6623265 /x11-base/xorg-server/files/xorg-server-1.11-pointer-to-int-cast.patch |
Added ebuilds for kogaion desktop
Diffstat (limited to 'x11-base/xorg-server/files/xorg-server-1.11-pointer-to-int-cast.patch')
-rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.11-pointer-to-int-cast.patch | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/x11-base/xorg-server/files/xorg-server-1.11-pointer-to-int-cast.patch b/x11-base/xorg-server/files/xorg-server-1.11-pointer-to-int-cast.patch new file mode 100644 index 00000000..beb94a9d --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.11-pointer-to-int-cast.patch @@ -0,0 +1,87 @@ +From b2a4c09507b267495ea5e4c2e05373b323c80edf Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston <jeremyhu@apple.com> +Date: Sat, 17 Dec 2011 20:56:59 +0000 +Subject: 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> +(cherry picked from commit 1deede3c48d5ac91f50774c79f02afc6e036614e) +--- +diff --git a/hw/kdrive/linux/keyboard.c b/hw/kdrive/linux/keyboard.c +index f5f9d9b..ba2637b 100644 +--- a/hw/kdrive/linux/keyboard.c ++++ b/hw/kdrive/linux/keyboard.c +@@ -692,7 +692,7 @@ LinuxKeyboardEnable (KdKeyboardInfo *ki) + return !Success; + + fd = LinuxConsoleFd; +- ki->driverPrivate = (void *) fd; ++ ki->driverPrivate = (void *) (intptr_t) fd; + + ioctl (fd, KDGKBMODE, &LinuxKbdTrans); + tcgetattr (fd, &LinuxTermios); +@@ -724,7 +724,7 @@ LinuxKeyboardDisable (KdKeyboardInfo *ki) + if (!ki) + return; + +- fd = (int) ki->driverPrivate; ++ fd = (int) (intptr_t) ki->driverPrivate; + + KdUnregisterFd(ki, fd, FALSE); + ioctl(fd, KDSKBMODE, LinuxKbdTrans); +@@ -753,7 +753,7 @@ LinuxKeyboardLeds (KdKeyboardInfo *ki, int leds) + if (!ki) + return; + +- ioctl ((int)ki->driverPrivate, KDSETLED, leds & 7); ++ ioctl ((int)(intptr_t)ki->driverPrivate, KDSETLED, leds & 7); + } + + KdKeyboardDriver LinuxKeyboardDriver = { +diff --git a/hw/kdrive/linux/ms.c b/hw/kdrive/linux/ms.c +index b6151cd..176e125 100644 +--- a/hw/kdrive/linux/ms.c ++++ b/hw/kdrive/linux/ms.c +@@ -152,7 +152,7 @@ MsEnable (KdPointerInfo *pi) + } + if (KdRegisterFd (port, MsRead, pi)) + return TRUE; +- pi->driverPrivate = (void *)port; ++ pi->driverPrivate = (void *)(intptr_t)port; + + return Success; + +@@ -164,7 +164,7 @@ MsEnable (KdPointerInfo *pi) + static void + MsDisable (KdPointerInfo *pi) + { +- KdUnregisterFd (pi, (int)pi->driverPrivate, TRUE); ++ KdUnregisterFd (pi, (int)(intptr_t)pi->driverPrivate, TRUE); + } + + static void +diff --git a/hw/kdrive/linux/ps2.c b/hw/kdrive/linux/ps2.c +index 465b963..b62d769 100644 +--- a/hw/kdrive/linux/ps2.c ++++ b/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 +-- +cgit v0.9.0.2-2-gbebe |