From 789db0244bba0fbaf22e553e4ca12f465b7f3ed6 Mon Sep 17 00:00:00 2001
From: "John F. Fay" <johnffay@nettally.com>
Date: Wed, 1 Feb 2012 01:51:40 +0000
Subject: [PATCH] Moving some header-style joystick code from
 "freeglut_joystick.c" to "freeglut_internal.h" to allow the
 code to build on X11

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1033 7f0cb862-5218-0410-a997-914c9d46530a
---
 src/Common/freeglut_internal.h |   76 ++++++++++++++++++++++++++++++++++++++++
 src/Common/freeglut_joystick.c |   76 ----------------------------------------
 2 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/src/Common/freeglut_internal.h b/src/Common/freeglut_internal.h
index bbef2ce..3870515 100644
--- a/src/Common/freeglut_internal.h
+++ b/src/Common/freeglut_internal.h
@@ -755,6 +755,82 @@ struct tagSFG_StrokeFont
 
 
 /* -- JOYSTICK-SPECIFIC STRUCTURES AND TYPES ------------------------------- */
+/*
+ * Initial defines from "js.h" starting around line 33 with the existing "freeglut_joystick.c"
+ * interspersed
+ */
+
+#if TARGET_HOST_MACINTOSH
+#    include <InputSprocket.h>
+#endif
+
+#if TARGET_HOST_MAC_OSX
+#    include <mach/mach.h>
+#    include <IOKit/IOkitLib.h>
+#    include <IOKit/hid/IOHIDLib.h>
+#endif
+
+#if TARGET_HOST_POSIX_X11
+#    ifdef HAVE_SYS_IOCTL_H
+#        include <sys/ioctl.h>
+#    endif
+#    ifdef HAVE_FCNTL_H
+#        include <fcntl.h>
+#    endif
+#    ifdef HAVE_ERRNO_H
+#        include <errno.h>
+#        include <string.h>
+#    endif
+#    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 <sys/joystick.h>
+#        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 <machine/joystick.h>         /* For analog joysticks */
+#        endif
+#        define JS_DATA_TYPE joystick
+#        define JS_RETURN (sizeof(struct JS_DATA_TYPE))
+#    endif
+
+#    if defined(__linux__)
+#        include <linux/joystick.h>
+
+/* check the joystick driver version */
+#        if defined(JS_VERSION) && JS_VERSION >= 0x010000
+#            define JS_NEW
+#        endif
+#    else  /* Not BSD or Linux */
+#        ifndef JS_RETURN
+
+  /*
+   * We'll put these values in and that should
+   * allow the code to at least compile when there is
+   * no support. The JS open routine should error out
+   * and shut off all the code downstream anyway and if
+   * the application doesn't use a joystick we'll be fine.
+   */
+
+  struct JS_DATA_TYPE
+  {
+    int buttons;
+    int x;
+    int y;
+  };
+
+#            define JS_RETURN (sizeof(struct JS_DATA_TYPE))
+#        endif
+#    endif
+#endif
+
 /* XXX It might be better to poll the operating system for the numbers of buttons and
  * XXX axes and then dynamically allocate the arrays.
  */
diff --git a/src/Common/freeglut_joystick.c b/src/Common/freeglut_joystick.c
index dc5e973..76f8542 100644
--- a/src/Common/freeglut_joystick.c
+++ b/src/Common/freeglut_joystick.c
@@ -37,82 +37,6 @@
 #    include <sys/param.h>
 #endif
 
-/*
- * Initial defines from "js.h" starting around line 33 with the existing "freeglut_joystick.c"
- * interspersed
- */
-
-#if TARGET_HOST_MACINTOSH
-#    include <InputSprocket.h>
-#endif
-
-#if TARGET_HOST_MAC_OSX
-#    include <mach/mach.h>
-#    include <IOKit/IOkitLib.h>
-#    include <IOKit/hid/IOHIDLib.h>
-#endif
-
-#if TARGET_HOST_POSIX_X11
-#    ifdef HAVE_SYS_IOCTL_H
-#        include <sys/ioctl.h>
-#    endif
-#    ifdef HAVE_FCNTL_H
-#        include <fcntl.h>
-#    endif
-#    ifdef HAVE_ERRNO_H
-#        include <errno.h>
-#        include <string.h>
-#    endif
-#    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 <sys/joystick.h>
-#        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 <machine/joystick.h>         /* For analog joysticks */
-#        endif
-#        define JS_DATA_TYPE joystick
-#        define JS_RETURN (sizeof(struct JS_DATA_TYPE))
-#    endif
-
-#    if defined(__linux__)
-#        include <linux/joystick.h>
-
-/* check the joystick driver version */
-#        if defined(JS_VERSION) && JS_VERSION >= 0x010000
-#            define JS_NEW
-#        endif
-#    else  /* Not BSD or Linux */
-#        ifndef JS_RETURN
-
-  /*
-   * We'll put these values in and that should
-   * allow the code to at least compile when there is
-   * no support. The JS open routine should error out
-   * and shut off all the code downstream anyway and if
-   * the application doesn't use a joystick we'll be fine.
-   */
-
-  struct JS_DATA_TYPE
-  {
-    int buttons;
-    int x;
-    int y;
-  };
-
-#            define JS_RETURN (sizeof(struct JS_DATA_TYPE))
-#        endif
-#    endif
-#endif
-
 #define JS_TRUE  1
 #define JS_FALSE 0
 
-- 
1.7.10.4