diff --git a/freeglut/freeglut/ChangeLog b/freeglut/freeglut/ChangeLog
index b31470e..a4a103a 100644
--- a/freeglut/freeglut/ChangeLog
+++ b/freeglut/freeglut/ChangeLog
@@ -1121,3 +1121,5 @@ extensions.
 
 (291) Solaris doesn't have cfmakeraw, but it is only a convenience function
 for some bit-fiddling, anyway.
+
+(292) Avoid gcc warnings for some joystick code (e.g. on Solaris).
diff --git a/freeglut/freeglut/src/freeglut_joystick.c b/freeglut/freeglut/src/freeglut_joystick.c
index dc0d0bb..af7c54c 100644
--- a/freeglut/freeglut/src/freeglut_joystick.c
+++ b/freeglut/freeglut/src/freeglut_joystick.c
@@ -1066,6 +1066,9 @@ static void fghJoystickOpen( SFG_Joystick* joy )
 #    endif
 #endif
 
+    /* Silence gcc, the correct #ifdefs would be too fragile... */
+    (void)i;
+
     /*
      * Default values (for no joystick -- each conditional will reset the
      * error flag)