# HG changeset patch # User diego # Date 1224185061 0 # Node ID 1266470a5651cce44d40221665d8449bf4523c70 # Parent 69f545e290ea5c7f1d18791b7438a9d323e1922f Revert declaring ThreadProc as void, it breaks the WINAPI. diff -r 69f545e290ea -r 1266470a5651 stream/cache2.c --- a/stream/cache2.c Thu Oct 16 19:12:57 2008 +0000 +++ b/stream/cache2.c Thu Oct 16 19:24:21 2008 +0000 @@ -20,9 +20,11 @@ #include "osdep/timer.h" #if defined(__MINGW32__) || defined(__CYGWIN__) #include +static DWORD WINAPI ThreadProc(void* s); #elif defined(__OS2__) #define INCL_DOS #include +static void ThreadProc( void *s ); #else #include #endif @@ -35,7 +37,6 @@ 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: @@ -361,9 +362,12 @@ #if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__OS2__) } - +#if defined(__MINGW32__) || defined(__CYGWIN__) +static DWORD WINAPI ThreadProc(void*s){ +#else // OS2 static void ThreadProc( void *s ){ #endif +#endif #ifdef CONFIG_GUI use_gui = 0; // mp_msg may not use gui stuff in forked code