X Strike Force XFree86 SVN commit: rev 759 - people/fabbione
Author: fabbione
Date: 2003-11-12 03:52:12 -0500 (Wed, 12 Nov 2003)
New Revision: 759
Removed:
people/fabbione/912_debian_glibc_header_fuckup_fix.diff
Log:
it is in branch now. Thanks Daniel
Deleted: people/fabbione/912_debian_glibc_header_fuckup_fix.diff
===================================================================
--- people/fabbione/912_debian_glibc_header_fuckup_fix.diff 2003-11-12 07:39:17 UTC (rev 758)
+++ people/fabbione/912_debian_glibc_header_fuckup_fix.diff 2003-11-12 08:52:12 UTC (rev 759)
@@ -1,45 +0,0 @@
-diff -Naurd xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
---- xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2002-10-20 23:45:27.000000000 +0200
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2003-11-10 11:39:43.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>
-diff -Naurd xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
---- xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2003-11-10 11:36:12.000000000 +0100
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2003-11-10 11:41:58.000000000 +0100
-@@ -94,12 +94,20 @@
- /* kbd rate stuff based on kbdrate.c from Rik Faith <faith@cs.unc.edu> 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__)
-@@ -161,6 +169,8 @@
- #endif /* KIOCSRATE */
- }
-
-+#undef rate
-+
- static void
- SetKbdRepeat(InputInfoPtr pInfo, char rad)
- {
Reply to: