Skip to content

V
vlc-1.1
Commit 649f40ae authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Attempt to fix MacOS build

parent 1794ae7b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
include/vlc_threads_funcs.h
View file @ 649f40ae
...@@ -507,7 +507,7 @@ static inline int __vlc_cond_wait( const char * psz_file, int i_line, ...@@ -507,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;
# if (_POSIX_CLOCK_MONOTONIC - 0 >= 0) # if defined (_POSIX_CLOCK_MONOTONIC) && (_POSIX_CLOCK_MONOTONIC >= 0)
if( clock_gettime( CLOCK_MONOTONIC, &timeout ) ) if( clock_gettime( CLOCK_MONOTONIC, &timeout ) )
# endif # endif
clock_gettime( CLOCK_REALTIME, &timeout ); clock_gettime( CLOCK_REALTIME, &timeout );
......
src/misc/threads.c
View file @ 649f40ae
...@@ -464,7 +464,7 @@ int __vlc_cond_init( vlc_object_t *p_this, vlc_cond_t *p_condvar ) ...@@ -464,7 +464,7 @@ int __vlc_cond_init( vlc_object_t *p_this, vlc_cond_t *p_condvar )
if (ret) if (ret)
return ret; return ret;
# if defined (HAVE_CLOCK_NANOSLEEP) && (_POSIX_CLOCK_MONOTONIC - 0 >= 0) # if defined (_POSIX_CLOCK_MONOTONIC) && (_POSIX_CLOCK_MONOTONIC >= 0)
/* This must be the same clock as the one in mtime.c */ /* This must be the same clock as the one in mtime.c */
pthread_condattr_setclock (&attr, CLOCK_MONOTONIC); pthread_condattr_setclock (&attr, CLOCK_MONOTONIC);
# endif # endif
......
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