[Freeglut-cvs] SF.net SVN: freeglut:[1860] trunk/freeglut/freeglut/src

[<dc...@us...>]

Revision: 1860
          http://sourceforge.net/p/freeglut/code/1860
Author:   dcnieho
Date:     2019-10-22 08:12:44 +0000 (Tue, 22 Oct 2019)
Log Message:
-----------
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)

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/wayland/fg_internal_wl.h
    trunk/freeglut/freeglut/src/x11/fg_internal_x11.h

Modified: trunk/freeglut/freeglut/src/wayland/fg_internal_wl.h
===================================================================
--- trunk/freeglut/freeglut/src/wayland/fg_internal_wl.h	2019-09-29 19:34:52 UTC (rev 1859)
+++ trunk/freeglut/freeglut/src/wayland/fg_internal_wl.h	2019-10-22 08:12:44 UTC (rev 1860)
@@ -105,18 +105,7 @@
 /* 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

Modified: trunk/freeglut/freeglut/src/x11/fg_internal_x11.h
===================================================================
--- trunk/freeglut/freeglut/src/x11/fg_internal_x11.h	2019-09-29 19:34:52 UTC (rev 1859)
+++ trunk/freeglut/freeglut/src/x11/fg_internal_x11.h	2019-10-22 08:12:44 UTC (rev 1860)
@@ -138,19 +138,7 @@
 #    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

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.