mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Returing WAIT_TIMEOUT for MUTEX objects now too.

This commit is contained in:
Armin Novak 2013-10-23 12:16:23 +02:00
parent c1051fe4c6
commit 17a024dcd1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winpr/libwinpr/synch/wait.c
View File

@ -150,9 +150,7 @@ DWORD WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds)
status = pthread_timedjoin_np(thread->thread, &thread_status, &timeout);
if (ETIMEDOUT == status)
{
return WAIT_TIMEOUT;
}
}
else
status = pthread_join(thread->thread, &thread_status);
@ -180,7 +178,9 @@ DWORD WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds)
clock_gettime(CLOCK_REALTIME, &timeout);
ts_add_ms(&timeout, dwMilliseconds);
pthread_mutex_timedlock(&mutex->mutex, &timeout);
status = pthread_mutex_timedlock(&mutex->mutex, &timeout);
if (ETIMEDOUT == status)
return WAIT_TIMEOUT;
}
else
{