[vlc-devel] commit: Fix prototypes of threaded functions. (Pierre d'Herbemont )

[git version control]

vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Sun Aug  3 19:19:54 2008 +0200| [9f15187610ae84720a88d2fd7b5a573fac706486] | committer: Pierre d'Herbemont 

Fix prototypes of threaded functions.

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

 modules/demux/live555.cpp |    3 ++-
 modules/demux/mkv.cpp     |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index cb31cfb..fdc2790 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -1702,8 +1702,9 @@ static void TaskInterrupt( void *p_private )
 /*****************************************************************************
  *
  *****************************************************************************/
-static void TimeoutPrevention( timeout_thread_t *p_timeout )
+static void * TimeoutPrevention( vlc_object_t * p_this )
 {
+    timeout_thread_t *p_timeout = (timeout_thread_t *)p_this;
     p_timeout->b_die = false;
     p_timeout->i_remain = (int64_t)p_timeout->p_sys->i_timeout -2;
     p_timeout->i_remain *= 1000000;
diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index 2f6597b..b339780 100644
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -1406,7 +1406,7 @@ public:
 
     /* event */
     event_thread_t *p_ev;
-    static int EventThread( vlc_object_t *p_this );
+    static void * EventThread( vlc_object_t *p_this );
     static int EventMouse( vlc_object_t *p_this, char const *psz_var,
                        vlc_value_t oldval, vlc_value_t newval, void *p_data );
     static int EventKey( vlc_object_t *p_this, char const *psz_var,
@@ -2797,7 +2797,7 @@ int demux_sys_t::EventKey( vlc_object_t *p_this, char const *,
     return VLC_SUCCESS;
 }
 
-int demux_sys_t::EventThread( vlc_object_t *p_this )
+void * demux_sys_t::EventThread( vlc_object_t *p_this )
 {
     event_thread_t *p_ev = (event_thread_t*)p_this;
     demux_sys_t    *p_sys = p_ev->p_demux->p_sys;