Fixing bug [ 1804696 ] Warnings when building on OpenSolaris as updated 2/2/09 by Nigel Stewart
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@762 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
parent
f0c1c62112
commit
7dc47277c7
@ -57,6 +57,11 @@
|
|||||||
*/
|
*/
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* Detect both SunPro and gcc compilers on Sun Solaris */
|
||||||
|
#if defined (__SVR4) && defined (__sun)
|
||||||
|
# define TARGET_HOST_SOLARIS 1
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef TARGET_HOST_MS_WINDOWS
|
#ifndef TARGET_HOST_MS_WINDOWS
|
||||||
# define TARGET_HOST_MS_WINDOWS 0
|
# define TARGET_HOST_MS_WINDOWS 0
|
||||||
#endif
|
#endif
|
||||||
@ -69,6 +74,10 @@
|
|||||||
# define TARGET_HOST_MAC_OSX 0
|
# define TARGET_HOST_MAC_OSX 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef TARGET_HOST_SOLARIS
|
||||||
|
# define TARGET_HOST_SOLARIS 0
|
||||||
|
#endif
|
||||||
|
|
||||||
/* -- FIXED CONFIGURATION LIMITS ------------------------------------------- */
|
/* -- FIXED CONFIGURATION LIMITS ------------------------------------------- */
|
||||||
|
|
||||||
#define FREEGLUT_MAX_MENUS 3
|
#define FREEGLUT_MAX_MENUS 3
|
||||||
|
@ -1394,7 +1394,7 @@ static void fghJoystickOpen( SFG_Joystick* joy )
|
|||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined( __linux__ )
|
#if defined( __linux__ ) || TARGET_HOST_SOLARIS
|
||||||
/* Default for older Linux systems. */
|
/* Default for older Linux systems. */
|
||||||
joy->num_axes = 2;
|
joy->num_axes = 2;
|
||||||
joy->num_buttons = 32;
|
joy->num_buttons = 32;
|
||||||
|
Reference in New Issue
Block a user