A further response to bug [ 1804696 ] Warnings when building on OpenSolaris -- per comment by Nigel Stewart on that bug report

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@763 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2009-02-03 14:31:36 +00:00
parent 7dc47277c7
commit 6ad88aa884
2 changed files with 2 additions and 2 deletions

View File

@ -1060,7 +1060,7 @@ static void fghJoystickOpen( SFG_Joystick* joy )
# ifdef JS_NEW # ifdef JS_NEW
unsigned char u; unsigned char u;
# else # else
# if defined( __linux__ ) # if defined( __linux__ ) || TARGET_HOST_SOLARIS
int counter = 0; int counter = 0;
# endif # endif
# endif # endif

View File

@ -308,7 +308,7 @@ static void fghCheckTimers( void )
* 32-bit, where the GLUT API return value is also overflowed. * 32-bit, where the GLUT API return value is also overflowed.
*/ */
unsigned long fgSystemTime(void) { unsigned long fgSystemTime(void) {
#if HAVE_GETTIMEOFDAY #if TARGET_HOST_SOLARIS || HAVE_GETTIMEOFDAY
struct timeval now; struct timeval now;
gettimeofday( &now, NULL ); gettimeofday( &now, NULL );
return now.tv_usec/1000 + now.tv_sec*1000; return now.tv_usec/1000 + now.tv_sec*1000;