From 228ed9638fa4d4428d983a2e2ca81d444025a5b9 Mon Sep 17 00:00:00 2001 From: dcnieho Date: Tue, 22 Oct 2019 08:12:44 +0000 Subject: [PATCH 1/2] Use on netbsd, too. is a compatibility header that only includes , and wasn't added to newer architectures. This helps the build on netbsd/aarch64. (cherry picked from commit bcfbede38ae8a2ec6933068dfb489e04bc9cc12e) git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1860 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/src/wayland/fg_internal_wl.h | 13 +------------ freeglut/freeglut/src/x11/fg_internal_x11.h | 14 +------------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/freeglut/freeglut/src/wayland/fg_internal_wl.h b/freeglut/freeglut/src/wayland/fg_internal_wl.h index 81bd5bc..de15ee4 100644 --- a/freeglut/freeglut/src/wayland/fg_internal_wl.h +++ b/freeglut/freeglut/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 -# 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 /* For analog joysticks */ -# endif +# include # define JS_DATA_TYPE joystick # define JS_RETURN (sizeof(struct JS_DATA_TYPE)) # endif diff --git a/freeglut/freeglut/src/x11/fg_internal_x11.h b/freeglut/freeglut/src/x11/fg_internal_x11.h index 09a238a..e2ba203 100644 --- a/freeglut/freeglut/src/x11/fg_internal_x11.h +++ b/freeglut/freeglut/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 -# 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 /* For analog joysticks */ -# endif +# include # define JS_DATA_TYPE joystick # define JS_RETURN (sizeof(struct JS_DATA_TYPE)) # endif From 67c0f23bddff52a14c208a0579c7d8b176e6d67a Mon Sep 17 00:00:00 2001 From: dcnieho Date: Tue, 22 Oct 2019 08:12:59 +0000 Subject: [PATCH 2/2] Omit mention of autoconf update, autoconf is no longer in use (cherry picked from commit fbbe1295dd098b58ae9ec83e447c281671f8f938) git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1861 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/src/wayland/fg_internal_wl.h | 1 - freeglut/freeglut/src/x11/fg_internal_x11.h | 1 - 2 files changed, 2 deletions(-) diff --git a/freeglut/freeglut/src/wayland/fg_internal_wl.h b/freeglut/freeglut/src/wayland/fg_internal_wl.h index de15ee4..4672d4e 100644 --- a/freeglut/freeglut/src/wayland/fg_internal_wl.h +++ b/freeglut/freeglut/src/wayland/fg_internal_wl.h @@ -102,7 +102,6 @@ struct tagSFG_PlatformWindowState #include # 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 # include diff --git a/freeglut/freeglut/src/x11/fg_internal_x11.h b/freeglut/freeglut/src/x11/fg_internal_x11.h index e2ba203..330cb86 100644 --- a/freeglut/freeglut/src/x11/fg_internal_x11.h +++ b/freeglut/freeglut/src/x11/fg_internal_x11.h @@ -136,7 +136,6 @@ struct tagSFG_PlatformWindowState #include # 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 # include # define JS_DATA_TYPE joystick