Unexport vlc_object_set_destructor

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 150e67fd5a8bbae57e6ba7e2a9af0a7aa94b145c..ca2ef972e052cfcca4c03fde366a9afaf0f14f47 100644 (file)
--- 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 fda0b8fae06275d5e8c9b8230aec761bdc66143b..044a599e473ace1f0ca5c16628d0c9d9c8fb9164 100644 (file)
--- 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 aacf1ffe9f9dfb2664469000cf3fb919749bcbc8..5231bb5b8a85396b1fb80d4f37230cdb124b9cd9 100644 (file)
--- 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