[xougen] [patch] make it compile on my debian

[Marcus Alanen]

These are required on my GNU Debian/Linux (testing) to make Xouvert 
compile.

Also, for the information to others, you need libxaw7 and 
libxaw7-dev installed instead of libxaw6 to be able to link 
xc/programs/Xserver/hw/xfree86/xf86cfg/help.c without problems. Or at 
least I needed it...


diff -aurd 
xouvert--pristine/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 
xouvert--mainline--0.1--base-0/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
--- xouvert--pristine/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c  
2003-12-14 22:15:34.000000000 +0200
+++ 
xouvert--mainline--0.1--base-0/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
     2003-12-14 23:33:56.000000000 +0200
@@ -36,6 +36,10 @@
 
 #define KBC_TIMEOUT 250        /* Timeout in ms for sending to keyboard 
controller */
 
+#ifdef linux
+#include <linux/version.h>
+#endif
+
 void
 xf86SoundKbdBell(int loudness, int pitch, int duration)
 {
diff -aurd 
xouvert--pristine/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 
xouvert--mainline--0.1--base-0/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
--- xouvert--pristine/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 
2003-12-14 22:15:34.000000000 +0200
+++ 
xouvert--mainline--0.1--base-0/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
    2003-12-14 23:46:05.000000000 +0200
@@ -99,6 +99,17 @@
 #include <asm/kbio.h>
 #endif
 
+#ifdef linux
+#include <linux/version.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 +171,10 @@
 #endif /* KIOCSRATE */
 }
 
+#ifdef rate
+#undef rate
+#endif
+
 static void
 SetKbdRepeat(InputInfoPtr pInfo, char rad)
 {