]> git.sesse.net Git - vlc/commitdiff
Factor common code
authorRémi Denis-Courmont <remi@remlab.net>
Tue, 12 Jul 2011 14:54:15 +0000 (17:54 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Tue, 12 Jul 2011 15:14:36 +0000 (18:14 +0300)
src/posix/thread.c

index 561f93a268ff8b33b40a41fa8860ed560b15f0f1..024d83b6fcd19f0f53bdb0e604d1144ae8f7fc5e 100644 (file)
@@ -405,17 +405,14 @@ int vlc_cond_timedwait (vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex,
     struct timespec ts = { d.quot, d.rem * (1000000000 / CLOCK_FREQ) };
 
     int val = pthread_cond_timedwait_relative_np(p_condvar, p_mutex, &ts);
-    if (val != ETIMEDOUT)
-        VLC_THREAD_ASSERT ("timed-waiting on condition");
-    return val;
 #else
     lldiv_t d = lldiv( deadline, CLOCK_FREQ );
     struct timespec ts = { d.quot, d.rem * (1000000000 / CLOCK_FREQ) };
     int val = pthread_cond_timedwait (p_condvar, p_mutex, &ts);
+#endif
     if (val != ETIMEDOUT)
         VLC_THREAD_ASSERT ("timed-waiting on condition");
     return val;
-#endif
 }
 
 /**