From b550a967436cc999f07e7a498815e2c8288c85e4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Wed, 28 Nov 2007 18:01:32 +0000 Subject: [PATCH] Ordering --- include/vlc_objects.h | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/include/vlc_objects.h b/include/vlc_objects.h index 7da1112926..5589f956f1 100644 --- a/include/vlc_objects.h +++ b/include/vlc_objects.h @@ -153,23 +153,6 @@ VLC_EXPORT( vlc_bool_t, __vlc_object_wait, ( vlc_object_t * ) ); #define vlc_object_wait( obj ) \ __vlc_object_wait( VLC_OBJECT( obj ) ) -/* NOTE: this function is a *temporary* convenience. - * See the vlc_object_alive() documentation for a better alternative. - */ -static inline -vlc_bool_t __vlc_object_lock_and_wait( vlc_object_t *obj ) -{ - vlc_bool_t b = VLC_TRUE; - - vlc_object_lock( obj ); - if( vlc_object_alive( obj ) ) - b = vlc_object_wait( obj ); - vlc_object_unlock( obj ); - return b; -} -#define vlc_object_lock_and_wait( obj ) \ - __vlc_object_lock_and_wait( VLC_OBJECT(obj) ) - VLC_EXPORT( int, __vlc_object_timedwait, ( vlc_object_t *, mtime_t ) ); #define vlc_object_timedwait( obj, d ) \ __vlc_object_timedwait( VLC_OBJECT( obj ), d ) @@ -196,3 +179,22 @@ VLC_EXPORT( vlc_bool_t, __vlc_object_alive, ( vlc_object_t * ) ); __vlc_object_alive( VLC_OBJECT(a) ) int vlc_object_waitpipe( vlc_object_t *obj ); + +/* NOTE: this function is a *temporary* convenience. + * See the vlc_object_alive() documentation for a better alternative. + */ +static inline +vlc_bool_t __vlc_object_lock_and_wait( vlc_object_t *obj ) +{ + vlc_bool_t b = VLC_TRUE; + + vlc_object_lock( obj ); + if( vlc_object_alive( obj ) ) + b = vlc_object_wait( obj ); + vlc_object_unlock( obj ); + return b; +} +#define vlc_object_lock_and_wait( obj ) \ + __vlc_object_lock_and_wait( VLC_OBJECT(obj) ) + + -- 2.39.5