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

Compilation fixes

parent 04d461bc
...@@ -134,6 +134,7 @@ static pthread_once_t vlc_clock_once = PTHREAD_ONCE_INIT; ...@@ -134,6 +134,7 @@ static pthread_once_t vlc_clock_once = PTHREAD_ONCE_INIT;
int nanosleep (struct timespec *, struct timespec *); int nanosleep (struct timespec *, struct timespec *);
# endif # endif
# define vlc_clock_setup() (void)0
#endif /* _POSIX_TIMERS */ #endif /* _POSIX_TIMERS */
/** /**
...@@ -352,8 +353,9 @@ void vlc_cond_init (vlc_cond_t *p_condvar) ...@@ -352,8 +353,9 @@ void vlc_cond_init (vlc_cond_t *p_condvar)
vlc_clock_setup (); vlc_clock_setup ();
if (unlikely(pthread_condattr_init (&attr))) if (unlikely(pthread_condattr_init (&attr)))
abort (); abort ();
#if (_POSIX_CLOCK_SELECTION > 0)
pthread_condattr_setclock (&attr, vlc_clock_id); pthread_condattr_setclock (&attr, vlc_clock_id);
#endif
if (unlikely(pthread_cond_init (p_condvar, &attr))) if (unlikely(pthread_cond_init (p_condvar, &attr)))
abort (); abort ();
pthread_condattr_destroy (&attr); pthread_condattr_destroy (&attr);
...@@ -956,7 +958,7 @@ mtime_t mdate (void) ...@@ -956,7 +958,7 @@ mtime_t mdate (void)
if (unlikely(gettimeofday (&tv, NULL) != 0)) if (unlikely(gettimeofday (&tv, NULL) != 0))
abort (); abort ();
return (INT64_C(1000000) * tv.tv_sec) + tv.tv_nsec; return (INT64_C(1000000) * tv.tv_sec) + tv.tv_usec;
#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