[vlc-devel] commit: Unexport vlc_object_detach ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jan 28 22:34:05 2010 +0200| [1e87443a23c8402521dbfc53bac436a8aff23dae] | committer: Rémi Denis-Courmont 

Unexport vlc_object_detach

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1e87443a23c8402521dbfc53bac436a8aff23dae
---

 include/vlc_objects.h |    4 ----
 src/libvlc.h          |    3 ++-
 src/libvlccore.sym    |    1 -
 src/misc/objects.c    |    4 ++--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index d58d2ee..c33639e 100644
--- 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 9949928..4ab242a 100644
--- 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 2bcc20c..8ce0034 100644
--- 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 725f10b..d44eac1 100644
--- 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;