X-Git-Url: https://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=blobdiff_plain;f=include%2Fvlc_threads_funcs.h;h=474a9ebc6058c51cab18733d9b3eb6526e819684;hp=0d7daaff6b04f813098bc6f13893ad71ae75c1e4;hb=3c7cb1679764fa0a10adf3d93b46723a97647992;hpb=ef0b207a0108eadc42f16a252228a3a69f8e0573 diff --git a/include/vlc_threads_funcs.h b/include/vlc_threads_funcs.h index 0d7daaff6b..474a9ebc60 100644 --- a/include/vlc_threads_funcs.h +++ b/include/vlc_threads_funcs.h @@ -140,10 +140,6 @@ static inline int __vlc_mutex_lock( const char * psz_file, int i_line, errno = i_result; } -#elif defined( HAVE_CTHREADS_H ) - mutex_lock( p_mutex->mutex ); - i_result = 0; - #endif if( i_result ) @@ -211,10 +207,6 @@ static inline int __vlc_mutex_unlock( const char * psz_file, int i_line, errno = i_result; } -#elif defined( HAVE_CTHREADS_H ) - mutex_unlock( p_mutex ); - i_result = 0; - #endif if( i_result ) @@ -348,14 +340,6 @@ static inline int __vlc_cond_signal( const char * psz_file, int i_line, errno = i_result; } -#elif defined( HAVE_CTHREADS_H ) - /* condition_signal() */ - if ( p_condvar->queue.head || p_condvar->implications ) - { - cond_signal( (condition_t)p_condvar ); - } - i_result = 0; - #endif if( i_result ) @@ -527,10 +511,6 @@ static inline int __vlc_cond_wait( const char * psz_file, int i_line, errno = i_result; } -#elif defined( HAVE_CTHREADS_H ) - condition_wait( (condition_t)p_condvar, (mutex_t)p_mutex ); - i_result = 0; - #endif if( i_result ) @@ -688,8 +668,6 @@ static inline int __vlc_cond_timedwait( const char * psz_file, int i_line, errno = i_res; } -#elif defined( HAVE_CTHREADS_H ) -# error Unimplemented #endif if( i_res ) @@ -731,8 +709,6 @@ static inline int vlc_threadvar_set( vlc_threadvar_t * p_tls, void *p_value ) #elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) i_ret = pthread_setspecific( p_tls->handle, p_value ); -#elif defined( HAVE_CTHREADS_H ) - i_ret = cthread_setspecific( p_tls->handle, p_value ); #endif return i_ret; @@ -753,11 +729,6 @@ static inline void* vlc_threadvar_get( vlc_threadvar_t * p_tls ) #elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) p_ret = pthread_getspecific( p_tls->handle ); -#elif defined( HAVE_CTHREADS_H ) - if ( !cthread_getspecific( p_tls->handle, &p_ret ) ) - { - p_ret = NULL; - } #endif return p_ret;