projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing the DOS/Linux line ending problems in the progs/demos/smooth_opengl3 project...
[freeglut]
/
src
/
freeglut_joystick.c
diff --git
a/src/freeglut_joystick.c
b/src/freeglut_joystick.c
index
e4bd53b
..
62c91ef
100644
(file)
--- a/
src/freeglut_joystick.c
+++ b/
src/freeglut_joystick.c
@@
-1039,7
+1039,7
@@
static int fghJoystickGetOEMProductName ( SFG_Joystick* joy, char *buf, int buf_
static void fghJoystickOpen( SFG_Joystick* joy )
{
static void fghJoystickOpen( SFG_Joystick* joy )
{
- int i;
+ int i = 0;
#if TARGET_HOST_MACINTOSH
OSStatus err;
#endif
#if TARGET_HOST_MACINTOSH
OSStatus err;
#endif
@@
-1060,8
+1060,8
@@
static void fghJoystickOpen( SFG_Joystick* joy )
# ifdef JS_NEW
unsigned char u;
# else
# ifdef JS_NEW
unsigned char u;
# else
-# if defined( __linux__ )
- int counter;
+# if defined( __linux__ ) || TARGET_HOST_SOLARIS
+ int counter = 0;
# endif
# endif
#endif
# endif
# endif
#endif
@@
-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. */
joy->num_axes = 2;
joy->num_buttons = 32;
/* Default for older Linux systems. */
joy->num_axes = 2;
joy->num_buttons = 32;
@@
-1688,9
+1688,6
@@
int fgJoystickDetect( void )
fgInitialiseJoysticks ();
fgInitialiseJoysticks ();
- if ( !fgJoystick )
- return 0;
-
if ( !fgState.JoysticksInitialised )
return 0;
if ( !fgState.JoysticksInitialised )
return 0;