[MPlayer-cvslog] r27759 - trunk/stream/cache2.c

[Diego Biurrun]

On Mon, Oct 13, 2008 at 06:38:00PM +0200, Reimar Döffinger wrote:
> On Mon, Oct 13, 2008 at 05:51:29PM +0200, diego wrote:
> > --- trunk/stream/cache2.c	(original)
> > +++ trunk/stream/cache2.c	Mon Oct 13 17:51:29 2008
> > @@ -20,11 +20,9 @@
> >  #include "osdep/timer.h"
> >  #ifdef WIN32
> >  #include <windows.h>
> > -static DWORD WINAPI ThreadProc(void* s);
> >  #elif defined(__OS2__)
> >  #define INCL_DOS
> >  #include <os2.h>
> > -static void ThreadProc( void *s );
> >  #else
> >  #include <sys/wait.h>
> >  #endif
> > @@ -37,6 +35,7 @@ extern int use_gui;
> >  
> >  int stream_fill_buffer(stream_t *s);
> >  int stream_seek_long(stream_t *s,off_t pos);
> > +static void ThreadProc(void *s);
> >  
> >  typedef struct {
> >    // constats:
> > @@ -362,12 +361,9 @@ int stream_enable_cache(stream_t *stream
> >    
> >  #if defined(WIN32) || defined(__OS2__)
> >  }
> > -#ifdef WIN32
> > -static DWORD WINAPI ThreadProc(void*s){
> > -#else   // OS2
> > +
> 
> Hell no! You can't just remove the WINAPI without risking hell to break
> loose (i.e. crashes). And yes the Windows ThreadProc does have a return
> value, we wer just missing the return statement.

Reverted.

Diego