summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Mainz <roland.mainz@nrubsig.org>2005-02-02 00:59:25 +0000
committerRoland Mainz <roland.mainz@nrubsig.org>2005-02-02 00:59:25 +0000
commit69a9ea89798ade87d46a6aa9b57e3ed98aa5609e (patch)
tree9c31f42a7400ee2b40c438b29bca1ef0bfc7ccfc
parent0917efa0062956513b018651d6592227df9513ff (diff)
xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c //bugs.freedesktop.org/show_bug.cgi?id=825) attachment #956 (https://bugs.freedesktop.org/attachment.cgi?id=956): Fix build problems on Linux/SPARC. Patch by Jeremy Huddleston <eradicator@gentoo.org>. Approved in the 2005-01-31 Xorg release-wranglers phone call.
-rw-r--r--hw/xfree86/os-support/bus/xf86Sbus.h1
-rw-r--r--hw/xfree86/os-support/linux/lnx_io.c4
-rw-r--r--hw/xfree86/os-support/linux/lnx_kbd.c4
3 files changed, 5 insertions, 4 deletions
diff --git a/hw/xfree86/os-support/bus/xf86Sbus.h b/hw/xfree86/os-support/bus/xf86Sbus.h
index dbd17810f..1ff4432b4 100644
--- a/hw/xfree86/os-support/bus/xf86Sbus.h
+++ b/hw/xfree86/os-support/bus/xf86Sbus.h
@@ -27,6 +27,7 @@
#if defined(linux)
#include <asm/types.h>
+#include <linux/fb.h>
#include <asm/fbio.h>
#include <asm/openpromio.h>
#elif defined(SVR4)
diff --git a/hw/xfree86/os-support/linux/lnx_io.c b/hw/xfree86/os-support/linux/lnx_io.c
index dda1ff8ef..1eebc757a 100644
--- a/hw/xfree86/os-support/linux/lnx_io.c
+++ b/hw/xfree86/os-support/linux/lnx_io.c
@@ -114,6 +114,8 @@ KDKBDREP_ioctl_ok(int rate, int delay) {
#endif /* KDKBDREP */
}
+#undef rate
+
static int
KIOCSRATE_ioctl_ok(int rate, int delay) {
#ifdef KIOCSRATE
@@ -141,8 +143,6 @@ KIOCSRATE_ioctl_ok(int rate, int delay) {
#endif /* KIOCSRATE */
}
-#undef rate
-
void xf86SetKbdRepeat(char rad)
{
#ifdef __sparc__
diff --git a/hw/xfree86/os-support/linux/lnx_kbd.c b/hw/xfree86/os-support/linux/lnx_kbd.c
index aa3e3f2f0..dd6df5cb5 100644
--- a/hw/xfree86/os-support/linux/lnx_kbd.c
+++ b/hw/xfree86/os-support/linux/lnx_kbd.c
@@ -142,6 +142,8 @@ KDKBDREP_ioctl_ok(int rate, int delay) {
#endif /* KDKBDREP */
}
+#undef rate
+
static int
KIOCSRATE_ioctl_ok(int rate, int delay) {
#ifdef KIOCSRATE
@@ -169,8 +171,6 @@ KIOCSRATE_ioctl_ok(int rate, int delay) {
#endif /* KIOCSRATE */
}
-#undef rate
-
static void
SetKbdRepeat(InputInfoPtr pInfo, char rad)
{