Commit 2f2ec59d authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Another attempt at fixing MacOS build

parent 649f40ae
...@@ -1226,8 +1226,8 @@ VLC_EXPORT( const char *, VLC_Changeset, ( void ) ); ...@@ -1226,8 +1226,8 @@ VLC_EXPORT( const char *, VLC_Changeset, ( void ) );
#include "vlc_messages.h" #include "vlc_messages.h"
#include "vlc_variables.h" #include "vlc_variables.h"
#include "vlc_objects.h" #include "vlc_objects.h"
#include "vlc_threads_funcs.h"
#include "vlc_mtime.h" #include "vlc_mtime.h"
#include "vlc_threads_funcs.h"
#include "vlc_modules.h" #include "vlc_modules.h"
#include "main.h" #include "main.h"
#include "vlc_configuration.h" #include "vlc_configuration.h"
......
...@@ -505,14 +505,10 @@ static inline int __vlc_cond_wait( const char * psz_file, int i_line, ...@@ -505,14 +505,10 @@ static inline int __vlc_cond_wait( const char * psz_file, int i_line,
# ifdef DEBUG # ifdef DEBUG
/* In debug mode, timeout */ /* In debug mode, timeout */
struct timespec timeout; struct timespec timeout = {
(mdate() / 1000000) + THREAD_COND_TIMEOUT,
# if defined (_POSIX_CLOCK_MONOTONIC) && (_POSIX_CLOCK_MONOTONIC >= 0) 0 /* 1Hz precision is sufficient here :-) */
if( clock_gettime( CLOCK_MONOTONIC, &timeout ) ) };
# endif
clock_gettime( CLOCK_REALTIME, &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,
&timeout ); &timeout );
......
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