From: Maya Rashish <maya@NetBSD.org>
Date: Tue, 22 Oct 2019 08:12:44 +0000 (+0000)
Subject: Use <sys/joystick.h> on netbsd, too.
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=freeglut;a=commitdiff_plain;h=ac0cc7254464a1e6deea091c4fd37e6e7fb211f5

Use <sys/joystick.h> on netbsd, too.

<machine/joystick.h> is a compatibility header that only includes
<sys/joystick.h>, and wasn't added to newer architectures.

This helps the build on netbsd/aarch64.

(cherry picked from commit bcfbede38ae8a2ec6933068dfb489e04bc9cc12e)

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1860 7f0cb862-5218-0410-a997-914c9d46530a
---

diff --git a/src/wayland/fg_internal_wl.h b/src/wayland/fg_internal_wl.h
index 81bd5bc..de15ee4 100644
--- a/src/wayland/fg_internal_wl.h
+++ b/src/wayland/fg_internal_wl.h
@@ -105,18 +105,7 @@ struct tagSFG_PlatformWindowState
 /* XXX The below hack is done until freeglut's autoconf is updated. */
 #        define HAVE_USB_JS    1
 
-#        if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#            include <sys/joystick.h>
-#        else
-/*
- * XXX NetBSD/amd64 systems may find that they have to steal the
- * XXX /usr/include/machine/joystick.h from a NetBSD/i386 system.
- * XXX I cannot comment whether that works for the interface, but
- * XXX it lets you compile...(^&  I do not think that we can do away
- * XXX with this header.
- */
-#            include <machine/joystick.h>         /* For analog joysticks */
-#        endif
+#        include <sys/joystick.h>
 #        define JS_DATA_TYPE joystick
 #        define JS_RETURN (sizeof(struct JS_DATA_TYPE))
 #    endif
diff --git a/src/x11/fg_internal_x11.h b/src/x11/fg_internal_x11.h
index 09a238a..e2ba203 100644
--- a/src/x11/fg_internal_x11.h
+++ b/src/x11/fg_internal_x11.h
@@ -138,19 +138,7 @@ struct tagSFG_PlatformWindowState
 #    if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
 /* XXX The below hack is done until freeglut's autoconf is updated. */
 #        define HAVE_USB_JS    1
-
-#        if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#            include <sys/joystick.h>
-#        else
-/*
- * XXX NetBSD/amd64 systems may find that they have to steal the
- * XXX /usr/include/machine/joystick.h from a NetBSD/i386 system.
- * XXX I cannot comment whether that works for the interface, but
- * XXX it lets you compile...(^&  I do not think that we can do away
- * XXX with this header.
- */
-#            include <machine/joystick.h>         /* For analog joysticks */
-#        endif
+#        include <sys/joystick.h>
 #        define JS_DATA_TYPE joystick
 #        define JS_RETURN (sizeof(struct JS_DATA_TYPE))
 #    endif