Unexport vlc_object_detach

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index d58d2ee1561c1a986941890dcf7eb068046c2907..c33639ebe8d9d9ee46e2c9721083c18be894a4c8 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -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_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_detach, ( vlc_object_t * ) );
 #if defined (__GNUC__) && !defined __cplusplus
 __attribute__((deprecated))
 #endif
@@ -91,9 +90,6 @@ VLC_EXPORT( char *, vlc_object_get_name, ( const vlc_object_t * ) ) LIBVLC_USED;
 #define vlc_object_set_destructor(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) \
     __vlc_object_attach( VLC_OBJECT(a), VLC_OBJECT(b) )
 

diff --git a/src/libvlc.h b/src/libvlc.h
index 9949928a68c5eb261c82d747b33e93287f1dba81..4ab242a1e795ee85bd805c2615425085c1afb412 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -48,7 +48,8 @@ void system_End       ( libvlc_int_t * );
 /*
  * 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

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 2bcc20c61cb5cb88a93b23bb765e06f50edb259e..8ce0034f557e0cfa81b4e46ca125bfdd1b8b8d2f 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -533,7 +533,6 @@ vlc_mutex_trylock
 vlc_mutex_unlock
 __vlc_object_attach
 vlc_object_create
-__vlc_object_detach
 __vlc_object_find
 vlc_object_find_name
 __vlc_object_hold

diff --git a/src/misc/objects.c b/src/misc/objects.c
index 725f10b6a09b6a516f3d5f901bc01c6276498beb..d44eac15019dbb639cde5645c812003c36373b28 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -672,14 +672,14 @@ static void vlc_object_detach_unlocked (vlc_object_t *p_this)
     p_this->p_parent = NULL;
 }
 
-
+#undef vlc_object_detach
 /**
  ****************************************************************************
  * detach object from 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;
     if( !p_this ) return;