Skip to content

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

Fixes debug build

parent c138ff41
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
include/vlc_threads_funcs.h
View file @ 2eae7e70
...@@ -45,6 +45,7 @@ VLC_EXPORT( int, __vlc_thread_set_priority, ( vlc_object_t *, const char *, int ...@@ -45,6 +45,7 @@ VLC_EXPORT( int, __vlc_thread_set_priority, ( vlc_object_t *, const char *, int
VLC_EXPORT( void, __vlc_thread_ready, ( vlc_object_t * ) ); VLC_EXPORT( void, __vlc_thread_ready, ( vlc_object_t * ) );
VLC_EXPORT( void, __vlc_thread_join, ( vlc_object_t *, const char *, int ) ); VLC_EXPORT( void, __vlc_thread_join, ( vlc_object_t *, const char *, int ) );
#include <errno.h>
/***************************************************************************** /*****************************************************************************
* vlc_threads_init: initialize threads system * vlc_threads_init: initialize threads system
...@@ -506,7 +507,7 @@ static inline int __vlc_cond_wait( const char * psz_file, int i_line, ...@@ -506,7 +507,7 @@ static inline int __vlc_cond_wait( const char * psz_file, int i_line,
/* In debug mode, timeout */ /* In debug mode, timeout */
struct timespec timeout; struct timespec timeout;
clock_gettime( CLOCK_MONOTONIC, &now ); clock_gettime( CLOCK_MONOTONIC, &timeout );
timeout.tv_sec += THREAD_COND_TIMEOUT; timeout.tv_sec += THREAD_COND_TIMEOUT;
i_result = pthread_cond_timedwait( &p_condvar->cond, &p_mutex->mutex, i_result = pthread_cond_timedwait( &p_condvar->cond, &p_mutex->mutex,
...@@ -580,7 +581,7 @@ static inline int __vlc_cond_timedwait( const char * psz_file, int i_line, ...@@ -580,7 +581,7 @@ static inline int __vlc_cond_timedwait( const char * psz_file, int i_line,
struct timespec ts = { d.quot, d.rem * 1000 }; struct timespec ts = { d.quot, d.rem * 1000 };
i_res = pthread_cond_timedwait( &p_condvar->cond, &p_mutex->mutex, &ts ); i_res = pthread_cond_timedwait( &p_condvar->cond, &p_mutex->mutex, &ts );
if( i_res = ETIMEDOUT ) if( i_res == ETIMEDOUT )
i_res = 0; /* this error is perfectly normal */ i_res = 0; /* this error is perfectly normal */
else else
if ( i_res ) /* other errors = bug */ if ( i_res ) /* other errors = bug */
......
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