s/vlc_object_die/vlc_object_kill/

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 3230ffd7fb5422441b2b6c126884be78636f8f01..e0c6e572527cbab130682d6e9c93a8b97839572c 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -96,7 +96,7 @@ struct vlc_object_t
  *****************************************************************************/
 VLC_EXPORT( void *, __vlc_object_create, ( vlc_object_t *, int ) );
 VLC_EXPORT( void, __vlc_object_destroy, ( vlc_object_t * ) );
-VLC_EXPORT( void, __vlc_object_die, ( vlc_object_t * ) );
+VLC_EXPORT( void, __vlc_object_kill, ( vlc_object_t * ) );
 VLC_EXPORT( void, __vlc_object_attach, ( vlc_object_t *, vlc_object_t * ) );
 VLC_EXPORT( void, __vlc_object_detach, ( vlc_object_t * ) );
 VLC_EXPORT( void *, __vlc_object_get, ( vlc_object_t *, int ) );

diff --git a/src/misc/objects.c b/src/misc/objects.c
index 49b784e1d679baba78e7847814c21dbe691c6f70..717efb53308bf5db3540181f9a7d0ab2be6d1174 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -436,7 +436,7 @@ void __vlc_object_destroy( vlc_object_t *p_this )
 }
 
 
-void __vlc_object_die( vlc_object_t *p_this )
+void __vlc_object_kill( vlc_object_t *p_this )
 {
     vlc_mutex_lock( &p_this->object_lock );
     p_this->b_die = VLC_TRUE;