projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix build on NetBSD.
[freeglut]
/
src
/
fg_joystick.c
diff --git
a/src/fg_joystick.c
b/src/fg_joystick.c
index
7d4c502
..
b73d7e7
100644
(file)
--- a/
src/fg_joystick.c
+++ b/
src/fg_joystick.c
@@
-46,21
+46,20
@@
# ifdef HAVE_USB_JS
# if defined(__NetBSD__)
# ifdef HAVE_USB_JS
# if defined(__NetBSD__)
-/* XXX The below hack is done until freeglut's autoconf is updated. */
-# define HAVE_USBHID_H 1
# ifdef HAVE_USBHID_H
# include <usbhid.h>
# else
# include <usb.h>
# endif
# ifdef HAVE_USBHID_H
# include <usbhid.h>
# else
# include <usb.h>
# endif
+# include <dev/usb/usb.h>
# elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
# ifdef HAVE_USBHID_H
# include <usbhid.h>
# else
# include <libusbhid.h>
# endif
# elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
# ifdef HAVE_USBHID_H
# include <usbhid.h>
# else
# include <libusbhid.h>
# endif
+# include <legacy/dev/usb/usb.h>
# endif
# endif
-# include <legacy/dev/usb/usb.h>
# include <dev/usb/usbhid.h>
/* Compatibility with older usb.h revisions */
# include <dev/usb/usbhid.h>
/* Compatibility with older usb.h revisions */
@@
-324,7
+323,7
@@
static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
if( joy->error )
return;
if( joy->error )
return;
- fgPlatformJoystickRawRead ( joy, buttons, axes );
+ fgPlatformJoystickRawRead ( joy, buttons, axes );
}
/*
}
/*