summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorJean-Marc Zucconi <jmz@FreeBSD.org>2003-03-24 14:31:15 +0000
committerJean-Marc Zucconi <jmz@FreeBSD.org>2003-03-24 14:31:15 +0000
commitf4ae7932b7a7b944ab955025d5eee20d37c797de (patch)
tree34f399cbcf7a50e574eb995d051f47faf5ef64e0 /x11
parentUse /sbin/shutdown (-p or -r) as the default halt/reboot command. (diff)
Fix build on -current.
Notes
Notes: svn path=/head/; revision=77386
Diffstat (limited to 'x11')
-rw-r--r--x11/XFree86/files/patch-zz22
1 files changed, 22 insertions, 0 deletions
diff --git a/x11/XFree86/files/patch-zz b/x11/XFree86/files/patch-zz
new file mode 100644
index 000000000000..053a38fcafd1
--- /dev/null
+++ b/x11/XFree86/files/patch-zz
@@ -0,0 +1,22 @@
+--- programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c.orig Tue Mar 4 16:29:48 2003
++++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c Tue Mar 4 16:29:55 2003
+@@ -28,7 +28,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include <machine/joystick.h>
++#include <sys/joystick.h>
+ #include <fcntl.h>
+
+ #define JS_RETURN sizeof(struct joystick)
+--- programs/Xserver/hw/xfree86/etc/joycal.c.orig Tue Mar 4 18:30:16 2003
++++ programs/Xserver/hw/xfree86/etc/joycal.c Tue Mar 4 18:30:25 2003
+@@ -6,7 +6,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ #if defined (__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+-#include <machine/joystick.h>
++#include <sys/joystick.h>
+ #define JS_RETURN sizeof(struct joystick)
+ #define JS_DATA_TYPE joystick
+ #define button_down(j) (j.b1 | j.b2)