X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_joystick.c;h=046e62fd49a0765c0df0114894173e9e1763aca2;hb=63f212e2f8143b6220b755abc12cf76e77a75aed;hp=781d0ddb47ed713ee6ffeb343221b5e578d52de2;hpb=1652c4a486eb064ee27d475b317d8bd22ea9e040;p=freeglut

diff --git a/src/freeglut_joystick.c b/src/freeglut_joystick.c
index 781d0dd..046e62f 100644
--- a/src/freeglut_joystick.c
+++ b/src/freeglut_joystick.c
@@ -41,8 +41,11 @@
  * Initial defines from "js.h" starting around line 33 with the existing "freeglut_joystick.c"
  * interspersed
  */
-#define _JS_MAX_BUTTONS 32
 
+/* XXX It might be better to poll the operating system for the numbers of buttons and
+ * XXX axes and then dynamically allocate the arrays.
+ */
+#define _JS_MAX_BUTTONS 32
 
 #if TARGET_HOST_MACINTOSH
 #    define _JS_MAX_AXES  9
@@ -60,7 +63,6 @@
 #    define _JS_MAX_AXES  8
 #    include <windows.h>
 #    include <mmsystem.h>
-#    include <string.h>
 #    include <regstr.h>
 
 #endif
@@ -73,6 +75,7 @@
 #    if HAVE_FCNTL_H
 #        include <fcntl.h>
 #    endif
+#    include <errno.h>
 #    if defined(__FreeBSD__) || defined(__NetBSD__)
 /* XXX The below hack is done until freeglut's autoconf is updated. */
 #        define HAVE_USB_JS    1
@@ -93,8 +96,6 @@
 #        define JS_RETURN (sizeof(struct JS_DATA_TYPE))
 #    endif
 
-#    include <errno.h>
-
 #    if defined(__linux__)
 #        include <linux/joystick.h>