Don't complain about timeouts on Windows in cond_timedwait.

diff --git a/include/vlc_threads_funcs.h b/include/vlc_threads_funcs.h
index 2823aa8385214c3458ab2b312324ec6406b8535a..88c0d5eede027ae52018c1a70577398025fe5876 100644 (file)
--- a/include/vlc_threads_funcs.h
+++ b/include/vlc_threads_funcs.h
@@ -607,6 +607,8 @@ static inline int __vlc_cond_timedwait( const char * psz_file, int i_line,
     vlc_mutex_lock( p_mutex );
 
     i_res = (int)result;
+    if(result == WAIT_TIMEOUT)
+       return WAIT_TIMEOUT; /* this error is perfectly normal */
 
 #elif defined( WIN32 )
     DWORD result;
@@ -695,6 +697,8 @@ static inline int __vlc_cond_timedwait( const char * psz_file, int i_line,
 
     /* Reacquire the mutex before returning. */
     vlc_mutex_lock( p_mutex );
+    if(result == WAIT_TIMEOUT)
+       return WAIT_TIMEOUT; /* this error is perfectly normal */
 
     i_res = (int)result;