I make this patch in order to compile latest CVS source with
Linux-2.6.16-rc2
XFree86 Version 4.5.99.20
Release Date: 23 January 2006
X Protocol Version 11, Revision 0
Build Operating System: Linux 2.6.16-rc2 i686 [ELF]
I know it would be nice to do that change in <input.h>, but afraid
it'll get shot down in lkml. Someone want to try? Please comment.
Thanks,
Jeff
--- xfree86/xc/programs/Xserver/hw/xfree86/input/acecad/acecad.c.org 2006-02-06 13:59:13 +0800
+++ xfree86/xc/programs/Xserver/hw/xfree86/input/acecad/acecad.c 2006-02-04 18:32:19 +0800
@@ -32,7 +32,10 @@
#ifdef LINUX_INPUT
#include <asm/types.h>
+#define kernel_ulong_t unsigned long
+#define BITS_PER_LONG 32
#include <linux/input.h>
+#undef BITS_PER_LONG
#ifdef BUS_PCI
#undef BUS_PCI
#endif
--- xfree86/xc/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c.org 2006-02-06 13:59:29 +0800
+++ xfree86/xc/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c 2006-02-04 18:43:34 +0800
@@ -49,7 +49,10 @@
#ifdef LINUX_INPUT
#include <asm/types.h>
+#define kernel_ulong_t unsigned long
+#define BITS_PER_LONG 32
#include <linux/input.h>
+#undef BITS_PER_LONG
/* 2.4.6 module support */
#ifndef EV_MSC
--- xfree86/xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.h.org 2006-02-06 13:59:45 +0800
+++ xfree86/xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.h 2006-02-04 18:45:52 +0800
@@ -42,6 +42,10 @@
#ifdef LINUX_INPUT
# include <asm/types.h>
+#define kernel_ulong_t unsigned long
+#define BITS_PER_LONG 32
+#include <linux/input.h>
+#undef BITS_PER_LONG
# include <linux/input.h>
# ifndef EV_MSC
# define EV_MSC 0x04
--- xfree86/xc/programs/Xserver/hw/xfree86/input/eloinput/xf86EloInput.c.org 2006-02-06 13:59:56 +0800
+++ xfree86/xc/programs/Xserver/hw/xfree86/input/eloinput/xf86EloInput.c 2006-02-04 18:46:26 +0800
@@ -38,7 +38,10 @@
*/
#include <asm/types.h>
+#define kernel_ulong_t unsigned long
+#define BITS_PER_LONG 32
#include <linux/input.h>
+#undef BITS_PER_LONG
#undef BUS_PCI
#undef BUS_ISA
#ifndef EV_SYN
--- xfree86/xc/programs/Xserver/hw/dmx/input/usb-private.h.org 2006-02-06 14:00:06 +0800
+++ xfree86/xc/programs/Xserver/hw/dmx/input/usb-private.h 2006-02-04 18:47:06 +0800
@@ -45,7 +45,10 @@
#include "inputstr.h"
#include <X11/Xos.h>
#include <errno.h>
+#define kernel_ulong_t unsigned long
+#define BITS_PER_LONG 32
#include <linux/input.h>
+#undef BITS_PER_LONG
#include "usb-common.h"
/* Support for force feedback was
--- xfree86/xc/programs/Xserver/hw/xfree86/input/ur98/xf86Ur-98.c.org 2006-02-06 14:00:15 +0800
+++ xfree86/xc/programs/Xserver/hw/xfree86/input/ur98/xf86Ur-98.c 2006-02-04 18:45:30 +0800
@@ -5,6 +5,10 @@
#include <string.h>
#include <errno.h>
#define inline __inline__
+#define kernel_ulong_t unsigned long
+#define BITS_PER_LONG 32
+#include <linux/input.h>
+#undef BITS_PER_LONG
#include <linux/joystick.h>
#undef BUS_ISA
_______________________________________________
Devel@xxxxxxxxxxx
http://XFree86.Org/mailman/listinfo/devel
