Moving the Windows-specific joystick definitions into the Windows-specific header...

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1026 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/src/Common/freeglut_internal.h b/src/Common/freeglut_internal.h
index 68466c4..7199da7 100644 (file)
--- a/src/Common/freeglut_internal.h
+++ b/src/Common/freeglut_internal.h
@@ -813,17 +813,6 @@ struct tagSFG_PlatformJoystick
 };\r
 #endif\r
 \r
 };\r
 #endif\r
 \r

-#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)\r
-#    define _JS_MAX_AXES  8\r
-typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;\r
-struct tagSFG_PlatformJoystick\r
-{\r
-    JOYCAPS     jsCaps;\r
-    JOYINFOEX   js;\r
-    UINT        js_id;\r
-};\r
-#endif\r
-\r

 #if TARGET_HOST_POSIX_X11\r
 #    define _JS_MAX_AXES 16\r
 typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;\r
 #if TARGET_HOST_POSIX_X11\r
 #    define _JS_MAX_AXES 16\r
 typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;\r

diff --git a/src/mswin/freeglut_internal_mswin.h b/src/mswin/freeglut_internal_mswin.h
index c83f231..4f8aaba 100644 (file)
--- a/src/mswin/freeglut_internal_mswin.h
+++ b/src/mswin/freeglut_internal_mswin.h
@@ -49,6 +49,20 @@ struct tagSFG_PlatformContext
 };\r
 \r
 \r
 };\r
 \r
 \r

+/* Joystick-Specific Definitions */\r
+#if !defined(_WIN32_WCE)\r
+#    define _JS_MAX_AXES  8\r
+typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;\r
+struct tagSFG_PlatformJoystick\r
+{\r
+    JOYCAPS     jsCaps;\r
+    JOYINFOEX   js;\r
+    UINT        js_id;\r
+};\r
+#endif\r
+\r
+\r
+\r

 /* Function to be called on exit */\r
 extern void (__cdecl *__glutExitFunc)( int return_value );\r
 \r
 /* Function to be called on exit */\r
 extern void (__cdecl *__glutExitFunc)( int return_value );\r
 \r