Use <sys/joystick.h> instead of <machine/joystick.h>.

Reviewed by:	will
This commit is contained in:
Jun Kuriyama 2002-04-08 13:54:01 +00:00
parent 957a36236f
commit c4916e7241
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=57440
2 changed files with 21 additions and 1 deletions

View file

@ -1,5 +1,14 @@
--- programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c.orig Sun Jul 26 01:56:34 1998
+++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c Fri Jan 5 09:48:25 2001
+++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c Mon Apr 8 14:32:01 2002
@@ -29,7 +29,7 @@
#include <unistd.h>
#include <string.h>
#include <errno.h>
-#include <machine/joystick.h>
+#include <sys/joystick.h>
#include <fcntl.h>
#ifdef XFree86LOADER
@@ -56,6 +56,7 @@
int changed = 0;
int timeinmicros;

View file

@ -0,0 +1,11 @@
--- ./programs/Xserver/hw/xfree86/etc/joycal.c.orig Sat Nov 22 09:00:18 1997
+++ ./programs/Xserver/hw/xfree86/etc/joycal.c Mon Apr 8 15:08:17 2002
@@ -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)