Skip to content

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

win32: do not straddle on POSIX threads symbols

parent e0e73f09
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
src/win32/thread.c
View file @ db6209ac
......@@ -162,9 +162,9 @@ void vlc_mutex_unlock (vlc_mutex_t *p_mutex)
/*** Condition variables ***/
enum
{
CLOCK_STATIC=0, /* must be zero for VLC_STATIC_COND */
CLOCK_MONOTONIC,
CLOCK_REALTIME,
VLC_CLOCK_STATIC=0, /* must be zero for VLC_STATIC_COND */
VLC_CLOCK_MONOTONIC,
VLC_CLOCK_REALTIME,
};
static void vlc_cond_init_common (vlc_cond_t *p_condvar, unsigned clock)
......@@ -178,12 +178,12 @@ static void vlc_cond_init_common (vlc_cond_t *p_condvar, unsigned clock)
void vlc_cond_init (vlc_cond_t *p_condvar)
{
vlc_cond_init_common (p_condvar, CLOCK_MONOTONIC);
vlc_cond_init_common (p_condvar, VLC_CLOCK_MONOTONIC);
}
void vlc_cond_init_daytime (vlc_cond_t *p_condvar)
{
vlc_cond_init_common (p_condvar, CLOCK_REALTIME);
vlc_cond_init_common (p_condvar, VLC_CLOCK_REALTIME);
}
void vlc_cond_destroy (vlc_cond_t *p_condvar)
......@@ -243,10 +243,10 @@ int vlc_cond_timedwait (vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex,
mtime_t total;
switch (p_condvar->clock)
{
case CLOCK_MONOTONIC:
case VLC_CLOCK_MONOTONIC:
total = mdate();
break;
case CLOCK_REALTIME: /* FIXME? sub-second precision */
case VLC_CLOCK_REALTIME: /* FIXME? sub-second precision */
total = CLOCK_FREQ * time (NULL);
break;
default:
......
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