[vlc-devel] commit: Do not hide many (all?) thread function having an incorrect prototype ( Rémi Denis-Courmont )

git version control git at videolan.org
Sun Aug 3 17:06:09 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sun Aug  3 18:03:07 2008 +0300| [2a4bf84cf17838eb9fb97555ab93ea90f51d8afd] | committer: Rémi Denis-Courmont 

Do not hide many (all?) thread function having an incorrect prototype

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2a4bf84cf17838eb9fb97555ab93ea90f51d8afd
---

 include/vlc_threads.h |    2 +-
 src/misc/threads.c    |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index 3f05340..c33eeb2 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 dd36dfe..aa5c3d0 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;




More information about the vlc-devel mailing list