Skip to content

V
vlc-1.1
Commit 8ff3851c authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* include/threads_funcs.h: fixed the --fast-mutex option.
parent 70630f32
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
include/threads_funcs.h
View file @ 8ff3851c
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* This header provides a portable threads implementation. * This header provides a portable threads implementation.
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: threads_funcs.h,v 1.4.2.3 2002/07/29 16:12:24 gbazin Exp $ * $Id: threads_funcs.h,v 1.4.2.4 2002/07/30 07:54:05 gbazin Exp $
* *
* Authors: Jean-Marc Dressler <polux@via.ecp.fr> * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr> * Samuel Hocevar <sam@via.ecp.fr>
...@@ -645,7 +645,7 @@ static inline int _vlc_cond_wait( char * psz_file, int i_line, ...@@ -645,7 +645,7 @@ static inline int _vlc_cond_wait( char * psz_file, int i_line,
/* Increase our wait count */ /* Increase our wait count */
p_condvar->i_waiting_threads++; p_condvar->i_waiting_threads++;
if( p_main->p_sys->SignalObjectAndWait ) if( p_main->p_sys->SignalObjectAndWait && p_mutex->mutex )
/* It is only possible to atomically release the mutex and initiate the /* It is only possible to atomically release the mutex and initiate the
* waiting on WinNT/2K/XP. Win9x doesn't have SignalObjectAndWait(). */ * waiting on WinNT/2K/XP. Win9x doesn't have SignalObjectAndWait(). */
p_main->p_sys->SignalObjectAndWait( p_mutex->mutex, p_main->p_sys->SignalObjectAndWait( p_mutex->mutex,
...@@ -656,6 +656,8 @@ static inline int _vlc_cond_wait( char * psz_file, int i_line, ...@@ -656,6 +656,8 @@ static inline int _vlc_cond_wait( char * psz_file, int i_line,
LeaveCriticalSection( &p_mutex->csection ); LeaveCriticalSection( &p_mutex->csection );
WaitForSingleObject( p_condvar->event, INFINITE ); WaitForSingleObject( p_condvar->event, INFINITE );
} }
p_condvar->i_waiting_threads--;
} }
else if( p_main->p_sys->i_win9x_cv == 1 ) else if( p_main->p_sys->i_win9x_cv == 1 )
{ {
......
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