projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implementing Jocelyn Frechot's changes -- see e-mail of Thursday, 11/8/2007 9:12 AM.
[freeglut]
/
src
/
freeglut_joystick.c
diff --git
a/src/freeglut_joystick.c
b/src/freeglut_joystick.c
index
f19c5b2
..
547c839
100644
(file)
--- a/
src/freeglut_joystick.c
+++ b/
src/freeglut_joystick.c
@@
-979,8
+979,8
@@
static void fghJoystickAddHatElement ( SFG_Joystick *joy, CFDictionaryRef button
/* Inspired by
http://msdn.microsoft.com/archive/en-us/dnargame/html/msdn_sidewind3d.asp
*/
/* Inspired by
http://msdn.microsoft.com/archive/en-us/dnargame/html/msdn_sidewind3d.asp
*/
-# if defined(_MSC_VER)
-# pragma comment (lib, "advapi32.lib") /* library pragmas are bad */
+# if FREEGLUT_LIB_PRAGMAS
+# pragma comment (lib, "advapi32.lib")
# endif
static int fghJoystickGetOEMProductName ( SFG_Joystick* joy, char *buf, int buf_sz )
# endif
static int fghJoystickGetOEMProductName ( SFG_Joystick* joy, char *buf, int buf_sz )
@@
-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
@@
-1061,7
+1061,7
@@
static void fghJoystickOpen( SFG_Joystick* joy )
unsigned char u;
# else
# if defined( __linux__ )
unsigned char u;
# else
# if defined( __linux__ )
- int counter;
+ int counter = 0;
# endif
# endif
#endif
# endif
# endif
#endif
@@
-1688,9
+1688,6
@@
int fgJoystickDetect( void )
fgInitialiseJoysticks ();
fgInitialiseJoysticks ();
- if ( !fgJoystick )
- return 0;
-
if ( !fgState.JoysticksInitialised )
return 0;
if ( !fgState.JoysticksInitialised )
return 0;