A further response to bug [ 1804696 ] Warnings when building on OpenSolaris -- per...

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@763 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/src/freeglut_joystick.c b/src/freeglut_joystick.c
index 1269a76..62c91ef 100644 (file)
--- a/src/freeglut_joystick.c
+++ b/src/freeglut_joystick.c
@@ -1060,7 +1060,7 @@ static void fghJoystickOpen( SFG_Joystick* joy )
 #    ifdef JS_NEW
        unsigned char u;
 #    else
-#      if defined( __linux__ )
+#      if defined( __linux__ ) || TARGET_HOST_SOLARIS
          int counter = 0;
 #      endif
 #    endif

diff --git a/src/freeglut_main.c b/src/freeglut_main.c
index ec08087..e47bd8a 100644 (file)
--- a/src/freeglut_main.c
+++ b/src/freeglut_main.c
@@ -308,7 +308,7 @@ static void fghCheckTimers( void )
  * 32-bit, where the GLUT API return value is also overflowed.
  */  
 unsigned long fgSystemTime(void) {
-#if HAVE_GETTIMEOFDAY
+#if TARGET_HOST_SOLARIS || HAVE_GETTIMEOFDAY
     struct timeval now;
     gettimeofday( &now, NULL );
     return now.tv_usec/1000 + now.tv_sec*1000;