From: Rémi Denis-Courmont <rem@videolan.org>
Date: Thu, 15 Feb 2007 16:38:41 +0000 (+0000)
Subject: s/vlc_object_die/vlc_object_kill/
X-Git-Tag: 0.9.0-test0~8577
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4986ab17f2f309464b3ccf29e6a3d870dc1a56e5;p=vlc

s/vlc_object_die/vlc_object_kill/
---

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 3230ffd7fb..e0c6e57252 100644
--- 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 49b784e1d6..717efb5330 100644
--- 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;