Fix harmless warnings with mingw in timing.c

This commit is contained in:
Manuel Pégourié-Gonnard 2015-02-11 11:36:31 +00:00
parent 38433535e3
commit dda5213982
3 changed files with 13 additions and 4 deletions

View file

@ -9,6 +9,7 @@ Features
Bugfix Bugfix
* Fix hardclock() (only used in the benchmarking program) with some * Fix hardclock() (only used in the benchmarking program) with some
versions of mingw64 (found by kxjhlele). versions of mingw64 (found by kxjhlele).
* Fix warnings from mingw64 in timing.c (found by kxjklele).
Changes Changes
* Move from SHA-1 to SHA-256 in example programs using signatures * Move from SHA-1 to SHA-256 in example programs using signatures

View file

@ -65,6 +65,10 @@ unsigned long get_timer( struct hr_time *val, int reset );
* \brief Setup an alarm clock * \brief Setup an alarm clock
* *
* \param seconds delay before the "alarmed" flag is set * \param seconds delay before the "alarmed" flag is set
*
* \warning Only one alarm at a time is supported. In a threaded
* context, this means one for the whole process, not one per
* thread.
*/ */
void set_alarm( int seconds ); void set_alarm( int seconds );

View file

@ -251,9 +251,13 @@ unsigned long get_timer( struct hr_time *val, int reset )
return( delta ); return( delta );
} }
DWORD WINAPI TimerProc( LPVOID uElapse ) /* It's OK to use a global because alarm() is supposed to be global anyway */
static DWORD alarmMs;
DWORD WINAPI TimerProc( LPVOID TimerContext )
{ {
Sleep( (DWORD) uElapse ); ((void) TimerContext);
Sleep( alarmMs );
alarmed = 1; alarmed = 1;
return( TRUE ); return( TRUE );
} }
@ -263,8 +267,8 @@ void set_alarm( int seconds )
DWORD ThreadId; DWORD ThreadId;
alarmed = 0; alarmed = 0;
CloseHandle( CreateThread( NULL, 0, TimerProc, alarmMs = seconds * 1000;
(LPVOID) ( seconds * 1000 ), 0, &ThreadId ) ); CloseHandle( CreateThread( NULL, 0, TimerProc, NULL, 0, &ThreadId ) );
} }
void m_sleep( int milliseconds ) void m_sleep( int milliseconds )