From: RĂ©mi Denis-Courmont Date: Sun, 3 Aug 2008 15:03:07 +0000 (+0300) Subject: Do not hide many (all?) thread function having an incorrect prototype X-Git-Tag: 0.9.0~629 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2a4bf84cf17838eb9fb97555ab93ea90f51d8afd;p=vlc Do not hide many (all?) thread function having an incorrect prototype --- diff --git a/include/vlc_threads.h b/include/vlc_threads.h index 3f0534097f..c33eeb2ad0 100644 --- a/include/vlc_threads.h +++ b/include/vlc_threads.h @@ -169,7 +169,7 @@ VLC_EXPORT( int, __vlc_cond_init, ( vlc_cond_t * ) ); VLC_EXPORT( void, __vlc_cond_destroy, ( const char *, int, vlc_cond_t * ) ); VLC_EXPORT( int, vlc_threadvar_create, (vlc_threadvar_t * , void (*) (void *) ) ); VLC_EXPORT( void, vlc_threadvar_delete, (vlc_threadvar_t *) ); -VLC_EXPORT( int, __vlc_thread_create, ( vlc_object_t *, const char *, int, const char *, void * ( * ) ( void * ), int, bool ) ); +VLC_EXPORT( int, __vlc_thread_create, ( vlc_object_t *, const char *, int, const char *, void * ( * ) ( vlc_object_t * ), int, bool ) ); VLC_EXPORT( int, __vlc_thread_set_priority, ( vlc_object_t *, const char *, int, int ) ); VLC_EXPORT( void, __vlc_thread_join, ( vlc_object_t *, const char *, int ) ); diff --git a/src/misc/threads.c b/src/misc/threads.c index dd36dfef90..aa5c3d0ffc 100644 --- a/src/misc/threads.c +++ b/src/misc/threads.c @@ -442,7 +442,7 @@ void vlc_threadvar_delete (vlc_threadvar_t *p_tls) struct vlc_thread_boot { - void * (*entry) (void *); + void * (*entry) (vlc_object_t *); vlc_object_t *object; }; @@ -457,7 +457,7 @@ struct vlc_thread_boot static THREAD_RTYPE thread_entry (void *data) { vlc_object_t *obj = ((struct vlc_thread_boot *)data)->object; - void *(*func) (void *) = ((struct vlc_thread_boot *)data)->entry; + void *(*func) (vlc_object_t *) = ((struct vlc_thread_boot *)data)->entry; free (data); #ifndef NDEBUG @@ -486,7 +486,7 @@ static THREAD_RTYPE thread_entry (void *data) * userland real-time priority threads. *****************************************************************************/ int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line, - const char *psz_name, void * ( *func ) ( void * ), + const char *psz_name, void * ( *func ) ( vlc_object_t * ), int i_priority, bool b_wait ) { int i_ret;