projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updating the ChangeLog and TODO files in preparation for the upcoming release
[freeglut]
/
src
/
freeglut_joystick.c
diff --git
a/src/freeglut_joystick.c
b/src/freeglut_joystick.c
index
30ad93b
..
046e62f
100644
(file)
--- a/
src/freeglut_joystick.c
+++ b/
src/freeglut_joystick.c
@@
-31,23
+31,21
@@
* Many thanks for Steve Baker for permission to pull from that library.
*/
* Many thanks for Steve Baker for permission to pull from that library.
*/
-#if defined( __FreeBSD__ ) || defined( __NetBSD__ )
-# include <sys/param.h>
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include <GL/freeglut.h>
#include "freeglut_internal.h"
#include <GL/freeglut.h>
#include "freeglut_internal.h"
+#if HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
/*
* Initial defines from "js.h" starting around line 33 with the existing "freeglut_joystick.c"
* interspersed
*/
/*
* 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
#if TARGET_HOST_MACINTOSH
# define _JS_MAX_AXES 9
@@
-65,18
+63,23
@@
# define _JS_MAX_AXES 8
# include <windows.h>
# include <mmsystem.h>
# define _JS_MAX_AXES 8
# include <windows.h>
# include <mmsystem.h>
-# include <string.h>
# include <regstr.h>
#endif
#if TARGET_HOST_UNIX_X11
# define _JS_MAX_AXES 16
# include <regstr.h>
#endif
#if TARGET_HOST_UNIX_X11
# define _JS_MAX_AXES 16
+# if HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+# endif
+# 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
# if defined(__FreeBSD__) || defined(__NetBSD__)
/* XXX The below hack is done until freeglut's autoconf is updated. */
# define HAVE_USB_JS 1
-# include <sys/ioctl.h>
# if defined(__FreeBSD__) && __FreeBSD_version >= 500000
# include <sys/joystick.h>
# else
# if defined(__FreeBSD__) && __FreeBSD_version >= 500000
# include <sys/joystick.h>
# else
@@
-93,12
+96,7
@@
# define JS_RETURN (sizeof(struct JS_DATA_TYPE))
# endif
# define JS_RETURN (sizeof(struct JS_DATA_TYPE))
# endif
-# include <unistd.h>
-# include <fcntl.h>
-# include <errno.h>
-
# if defined(__linux__)
# if defined(__linux__)
-# include <sys/ioctl.h>
# include <linux/joystick.h>
/* check the joystick driver version */
# include <linux/joystick.h>
/* check the joystick driver version */