Changeset 2c5dbee651298b3a8d8538a2f1415f78e4f25a84

Timestamp:

16/01/08 20:36:50 (11 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1200512210 +0000

git-parent:

[658b4f830b832b19a6de708764f91e1398e501a1]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1200512210 +0000

Message:

Don't complain about timeouts on Windows in cond_timedwait.

Files:

• include/vlc_threads_funcs.h (modified) (2 diffs)

include/vlc_threads_funcs.h

@@ -608 +608 @@
-
-    i_res = (int)result;
+    if(result == WAIT_TIMEOUT)
+       return WAIT_TIMEOUT; /* this error is perfectly normal */
-
-#elif defined( WIN32 )
@@ -696 +698 @@
-    /* 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;