X Strike Force XFree86 SVN commit: rev 924 - branches/4.3.0/sid/debian/patches
Author: branden
Date: 2004-01-16 13:21:16 -0500 (Fri, 16 Jan 2004)
New Revision: 924
Modified:
branches/4.3.0/sid/debian/patches/050_fix_lnx_io_kbd_rate_fix.diff
Log:
Update patch to fix both occurences of the re-#define problem. Why does
upstream have duplicate code? :(
Modified: branches/4.3.0/sid/debian/patches/050_fix_lnx_io_kbd_rate_fix.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/050_fix_lnx_io_kbd_rate_fix.diff 2004-01-15 20:58:28 UTC (rev 923)
+++ branches/4.3.0/sid/debian/patches/050_fix_lnx_io_kbd_rate_fix.diff 2004-01-16 18:21:16 UTC (rev 924)
@@ -8,8 +8,8 @@
Not submitted upstream yet.
---- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c.orig 2004-01-14 20:01:04.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2004-01-14 20:14:56.000000000 -0500
+--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c.orig 2004-01-16 13:17:05.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2004-01-16 13:17:15.000000000 -0500
@@ -73,7 +73,9 @@
#include <asm/kbio.h>
#endif
@@ -35,3 +35,30 @@
static int
KIOCSRATE_ioctl_ok(int rate, int delay) {
#ifdef KIOCSRATE
+--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c.orig 2004-01-16 13:17:10.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2004-01-16 13:18:21.000000000 -0500
+@@ -101,7 +101,9 @@
+ #include <asm/kbio.h>
+ #endif
+
+-/* Deal with spurious kernel header change */
++/* Deal with spurious kernel header change in struct kbd_repeat.
++ We undo this define after the routine using that struct is over,
++ so as not to interfere with other 'rate' elements. */
+ #if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
+ # if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
+ # define rate period
+@@ -143,6 +145,13 @@
+ #endif /* KDKBDREP */
+ }
+
++/* Undo the earlier define for the struct kbd_repeat problem. */
++#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
++# undef rate
++# endif
++#endif
++
+ static int
+ KIOCSRATE_ioctl_ok(int rate, int delay) {
+ #ifdef KIOCSRATE
Reply to: