X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_joystick.c;h=a978d7fa8b43a37f10e53b427cbb945bcd1bbe4e;hb=45260a6156a412f1938a5cca08d66b9841dab6f7;hp=f19c5b25b1645f2c892605df17cb751786509da1;hpb=7fdce1253e14170b6cb933f13c1f2a1644c93793;p=freeglut

diff --git a/src/freeglut_joystick.c b/src/freeglut_joystick.c
index f19c5b2..a978d7f 100644
--- 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
  */
-#    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 )
@@ -1688,9 +1688,6 @@ int fgJoystickDetect( void )
 
     fgInitialiseJoysticks ();
 
-    if ( !fgJoystick )
-        return 0;
-
     if ( !fgState.JoysticksInitialised )
         return 0;