Update of /cvsroot/plib/plib/src/js
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22866/src/js
Modified Files:
jsBSD.cxx
Log Message:
Apply two patches from the FreeBSD ports collection.
Index: jsBSD.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/js/jsBSD.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- jsBSD.cxx 21 Sep 2004 11:45:55 -0000 1.5
+++ jsBSD.cxx 12 Jan 2005 01:22:26 -0000 1.6
@@ -45,7 +45,11 @@
#endif
#include <sys/ioctl.h>
-#include <machine/joystick.h> // For analog joysticks
+#if defined(__FreeBSD__)
+# include <sys/joystick.h>
+#else
+# include <machine/joystick.h> // For analog joysticks
+#endif
#ifdef HAVE_USB_JS
#if defined(__NetBSD__)
#ifdef HAVE_USBHID_H
@@ -55,7 +59,12 @@
#endif
#elif defined(__FreeBSD__)
extern "C" {
-#include <libusbhid.h>
+# if __FreeBSD_version < 500000
+# include <libusbhid.h>
+# else
+# define HAVE_USBHID_H 1
+# include <usbhid.h>
+# endif
}
#endif
#include <dev/usb/usb.h>
|
