From 7662d246c2686f027ab71cbe4eb9d7310a236583 Mon Sep 17 00:00:00 2001 From: "John F. Fay" Date: Sun, 29 Jan 2012 05:26:54 +0000 Subject: [PATCH] Moving the Windows-specific joystick definitions into the Windows-specific header file git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1026 7f0cb862-5218-0410-a997-914c9d46530a --- src/Common/freeglut_internal.h | 11 ----------- src/mswin/freeglut_internal_mswin.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/Common/freeglut_internal.h b/src/Common/freeglut_internal.h index 68466c4..7199da7 100644 --- a/src/Common/freeglut_internal.h +++ b/src/Common/freeglut_internal.h @@ -813,17 +813,6 @@ struct tagSFG_PlatformJoystick }; #endif -#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE) -# define _JS_MAX_AXES 8 -typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick; -struct tagSFG_PlatformJoystick -{ - JOYCAPS jsCaps; - JOYINFOEX js; - UINT js_id; -}; -#endif - #if TARGET_HOST_POSIX_X11 # define _JS_MAX_AXES 16 typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick; diff --git a/src/mswin/freeglut_internal_mswin.h b/src/mswin/freeglut_internal_mswin.h index c83f231..4f8aaba 100644 --- a/src/mswin/freeglut_internal_mswin.h +++ b/src/mswin/freeglut_internal_mswin.h @@ -49,6 +49,20 @@ struct tagSFG_PlatformContext }; +/* Joystick-Specific Definitions */ +#if !defined(_WIN32_WCE) +# define _JS_MAX_AXES 8 +typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick; +struct tagSFG_PlatformJoystick +{ + JOYCAPS jsCaps; + JOYINFOEX js; + UINT js_id; +}; +#endif + + + /* Function to be called on exit */ extern void (__cdecl *__glutExitFunc)( int return_value ); -- 1.7.10.4