Skip to content

V
vlc-2-2
Commit 4986ab17 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

s/vlc_object_die/vlc_object_kill/

parent 690aa907
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
include/vlc_objects.h
View file @ 4986ab17
...@@ -96,7 +96,7 @@ struct vlc_object_t ...@@ -96,7 +96,7 @@ struct vlc_object_t
*****************************************************************************/ *****************************************************************************/
VLC_EXPORT( void *, __vlc_object_create, ( vlc_object_t *, int ) ); VLC_EXPORT( void *, __vlc_object_create, ( vlc_object_t *, int ) );
VLC_EXPORT( void, __vlc_object_destroy, ( vlc_object_t * ) ); 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_attach, ( vlc_object_t *, vlc_object_t * ) );
VLC_EXPORT( void, __vlc_object_detach, ( vlc_object_t * ) ); VLC_EXPORT( void, __vlc_object_detach, ( vlc_object_t * ) );
VLC_EXPORT( void *, __vlc_object_get, ( vlc_object_t *, int ) ); VLC_EXPORT( void *, __vlc_object_get, ( vlc_object_t *, int ) );
......
src/misc/objects.c
View file @ 4986ab17
...@@ -436,7 +436,7 @@ void __vlc_object_destroy( vlc_object_t *p_this ) ...@@ -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 ); vlc_mutex_lock( &p_this->object_lock );
p_this->b_die = VLC_TRUE; p_this->b_die = VLC_TRUE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment