[vlc-commits] Unexport vlc_object_set_destructor

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Feb 12 20:12:38 2011 +0200| [c3d52168d9079b84953cbe93c228d6491dd65067] | committer: Rémi Denis-Courmont

Unexport vlc_object_set_destructor

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

 include/vlc_objects.h |    7 -------
 src/libvlc.h          |    6 ++++++
 src/libvlccore.sym    |    1 -
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 150e67f..ca2ef97 100644
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -50,9 +50,6 @@
 #define OBJECT_FLAGS_QUIET       0x0002
 #define OBJECT_FLAGS_NOINTERACT  0x0004
 
-/* Types */
-typedef void (*vlc_destructor_t)(struct vlc_object_t *);
-
 /*****************************************************************************
  * The vlc_object_t type. Yes, it's that simple :-)
  *****************************************************************************/
@@ -66,7 +63,6 @@ struct vlc_object_t
  * Prototypes
  *****************************************************************************/
 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 * ) );
 #if defined (__GNUC__) && !defined __cplusplus
 __attribute__((deprecated))
@@ -87,9 +83,6 @@ VLC_EXPORT( char *, vlc_object_get_name, ( const vlc_object_t * ) ) LIBVLC_USED;
 
 #define vlc_object_create(a,b) vlc_object_create( VLC_OBJECT(a), b )
 
-#define vlc_object_set_destructor(a,b) \
-    vlc_object_set_destructor( VLC_OBJECT(a), b )
-
 #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 fda0b8f..044a599 100644
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -129,6 +129,12 @@ vlc_custom_create (vlc_object_t *p_this, size_t i_size, int i_type,
 extern int vlc_object_set_name(vlc_object_t *, const char *);
 #define vlc_object_set_name(o, n) vlc_object_set_name(VLC_OBJECT(o), n)
 
+/* Types */
+typedef void (*vlc_destructor_t) (struct vlc_object_t *);
+void vlc_object_set_destructor (vlc_object_t *, vlc_destructor_t);
+#define vlc_object_set_destructor(a,b) \
+        vlc_object_set_destructor (VLC_OBJECT(a), b)
+
 /*
  * To be cleaned-up module stuff:
  */
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index aacf1ff..5231bb5 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -584,7 +584,6 @@ vlc_object_find_name
 vlc_object_hold
 vlc_object_kill
 vlc_object_release
-vlc_object_set_destructor
 vlc_object_get_name
 vlc_plugin_set
 vlc_poll