Skip to content

V
vlc-2-2
Commit 2c5dbee6 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Don't complain about timeouts on Windows in cond_timedwait.

parent 658b4f83
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
include/vlc_threads_funcs.h
View file @ 2c5dbee6
...@@ -607,6 +607,8 @@ static inline int __vlc_cond_timedwait( const char * psz_file, int i_line, ...@@ -607,6 +607,8 @@ static inline int __vlc_cond_timedwait( const char * psz_file, int i_line,
vlc_mutex_lock( p_mutex ); vlc_mutex_lock( p_mutex );
i_res = (int)result; i_res = (int)result;
if(result == WAIT_TIMEOUT)
return WAIT_TIMEOUT; /* this error is perfectly normal */
#elif defined( WIN32 ) #elif defined( WIN32 )
DWORD result; DWORD result;
...@@ -695,6 +697,8 @@ static inline int __vlc_cond_timedwait( const char * psz_file, int i_line, ...@@ -695,6 +697,8 @@ static inline int __vlc_cond_timedwait( const char * psz_file, int i_line,
/* Reacquire the mutex before returning. */ /* Reacquire the mutex before returning. */
vlc_mutex_lock( p_mutex ); vlc_mutex_lock( p_mutex );
if(result == WAIT_TIMEOUT)
return WAIT_TIMEOUT; /* this error is perfectly normal */
i_res = (int)result; i_res = (int)result;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment