[patch] patch

xfree-4.3.0-linux-headers-2.6.0.patch (text/plain), 1.06 KB, created by Andrew Kirilenko on 2003-12-28 15:26:24 UTC

--- programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
+++ programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
@@ -67,6 +67,7 @@ xf86GetKbdLeds()
  * from util-linux-2.9t package */
 
 #include <linux/kd.h>
+#include <linux/version.h>
 #ifdef __sparc__
 #include <asm/param.h>
 #include <asm/kbio.h>
--- programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
+++ programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
@@ -94,11 +94,19 @@ GetKbdLeds(InputInfoPtr pInfo)
  * from util-linux-2.9t package */
 
 
+#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__)
@@ -160,6 +168,8 @@ KIOCSRATE_ioctl_ok(int rate, int delay) 
 #endif /* KIOCSRATE */
 }
 
+#undef rate
+
 static void
 SetKbdRepeat(InputInfoPtr pInfo, char rad)
 {