[patch] Small hacks taken from xfree development branch

xfree-linux-2.6.0.patch (text/plain), 1.31 KB, created by jack_mort on 2003-12-26 10:05:28 UTC

--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c.orig	2003-12-26 18:02:02.000000000 +0100
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c	2003-12-26 18:04:34.000000000 +0100
@@ -93,11 +93,20 @@
 /* kbd rate stuff based on kbdrate.c from Rik Faith <[e-mail]> et.al.
  * from util-linux-2.9t package */
 
+#include <linux/kd.h>
+#include <linux/version.h>
 #ifdef __sparc__
 #include <asm/param.h>
 #include <asm/kbio.h>
 #endif
 
+/* Deal with spurious kernel header change */
+#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
+#  define rate period
+# endif
+#endif
+                                                                                
 static int
 KDKBDREP_ioctl_ok(int rate, int delay) {
 #if defined(KDKBDREP) && !defined(__sparc__)
@@ -159,6 +168,8 @@
 #endif /* KIOCSRATE */
 }
 
+#undef rate
+
 static void
 SetKbdRepeat(InputInfoPtr pInfo, char rad)
 {
--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c.orig	2003-12-26 18:19:59.980207940 +0100
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c	2003-12-26 16:57:40.000000000 +0100
@@ -67,6 +67,7 @@
  * from util-linux-2.9t package */
 
 #include <linux/kd.h>
+#include <linux/version.h>
 #ifdef __sparc__
 #include <asm/param.h>
 #include <asm/kbio.h>