Rework delay checking, use it for net_Accept, add deadline checks

[vlc] / include / vlc_threads.h

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index 3afadfadf41e8d78b16b4269cf46a5137d15fb91..392db0686518510d419d3a3974c4b752caa506d5 100644 (file)
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -411,8 +411,8 @@ static inline void __vlc_cond_wait( const char * psz_file, int i_line,
  *****************************************************************************
  * Returns 0 if object signaled, an error code in case of timeout or error.
  *****************************************************************************/
-#define vlc_cond_timedwait( P_COND, P_MUTEX, DEADLINE )                      \
-    __vlc_cond_timedwait( __FILE__, __LINE__, P_COND, P_MUTEX, DEADLINE  )
+#define vlc_cond_timedwait( c, m, d ) \
+    __vlc_cond_timedwait( __FILE__, __LINE__, c, m, check_deadline(d) )
 
 static inline int __vlc_cond_timedwait( const char * psz_file, int i_line,
                                         vlc_cond_t *p_condvar,