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

Unexport vlc_object_detach

parent 27cdd6eb
...@@ -68,7 +68,6 @@ struct vlc_object_t ...@@ -68,7 +68,6 @@ struct vlc_object_t
VLC_EXPORT( void *, vlc_object_create, ( vlc_object_t *, size_t ) ) LIBVLC_MALLOC LIBVLC_USED; VLC_EXPORT( void *, vlc_object_create, ( vlc_object_t *, size_t ) ) LIBVLC_MALLOC LIBVLC_USED;
VLC_EXPORT( void, __vlc_object_set_destructor, ( vlc_object_t *, vlc_destructor_t ) ); VLC_EXPORT( void, __vlc_object_set_destructor, ( vlc_object_t *, vlc_destructor_t ) );
VLC_EXPORT( void, __vlc_object_attach, ( vlc_object_t *, vlc_object_t * ) ); VLC_EXPORT( void, __vlc_object_attach, ( vlc_object_t *, vlc_object_t * ) );
VLC_EXPORT( void, __vlc_object_detach, ( vlc_object_t * ) );
#if defined (__GNUC__) && !defined __cplusplus #if defined (__GNUC__) && !defined __cplusplus
__attribute__((deprecated)) __attribute__((deprecated))
#endif #endif
...@@ -91,9 +90,6 @@ VLC_EXPORT( char *, vlc_object_get_name, ( const vlc_object_t * ) ) LIBVLC_USED; ...@@ -91,9 +90,6 @@ VLC_EXPORT( char *, vlc_object_get_name, ( const vlc_object_t * ) ) LIBVLC_USED;
#define vlc_object_set_destructor(a,b) \ #define vlc_object_set_destructor(a,b) \
__vlc_object_set_destructor( VLC_OBJECT(a), b ) __vlc_object_set_destructor( VLC_OBJECT(a), b )
#define vlc_object_detach(a) \
__vlc_object_detach( VLC_OBJECT(a) )
#define vlc_object_attach(a,b) \ #define vlc_object_attach(a,b) \
__vlc_object_attach( VLC_OBJECT(a), VLC_OBJECT(b) ) __vlc_object_attach( VLC_OBJECT(a), VLC_OBJECT(b) )
......
...@@ -48,7 +48,8 @@ void system_End ( libvlc_int_t * ); ...@@ -48,7 +48,8 @@ void system_End ( libvlc_int_t * );
/* /*
* Legacy object stuff that is still used within libvlccore (only) * Legacy object stuff that is still used within libvlccore (only)
*/ */
#define vlc_object_signal_unlocked( obj ) void vlc_object_detach (vlc_object_t *);
#define vlc_object_detach( o ) vlc_object_detach(VLC_OBJECT(o))
/* /*
* Threads subsystem * Threads subsystem
......
...@@ -533,7 +533,6 @@ vlc_mutex_trylock ...@@ -533,7 +533,6 @@ vlc_mutex_trylock
vlc_mutex_unlock vlc_mutex_unlock
__vlc_object_attach __vlc_object_attach
vlc_object_create vlc_object_create
__vlc_object_detach
__vlc_object_find __vlc_object_find
vlc_object_find_name vlc_object_find_name
__vlc_object_hold __vlc_object_hold
......
...@@ -672,14 +672,14 @@ static void vlc_object_detach_unlocked (vlc_object_t *p_this) ...@@ -672,14 +672,14 @@ static void vlc_object_detach_unlocked (vlc_object_t *p_this)
p_this->p_parent = NULL; p_this->p_parent = NULL;
} }
#undef vlc_object_detach
/** /**
**************************************************************************** ****************************************************************************
* detach object from its parent * detach object from its parent
***************************************************************************** *****************************************************************************
* This function removes all links between an object and its parent. * This function removes all links between an object and its parent.
*****************************************************************************/ *****************************************************************************/
void __vlc_object_detach( vlc_object_t *p_this ) void vlc_object_detach( vlc_object_t *p_this )
{ {
vlc_object_t *p_parent; vlc_object_t *p_parent;
if( !p_this ) return; if( !p_this ) return;
......
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