Mercurial > mplayer.hg
changeset 27756:1266470a5651
Revert declaring ThreadProc as void, it breaks the WINAPI.
| author | diego |
|---|---|
| date | Thu, 16 Oct 2008 19:24:21 +0000 |
| parents | 69f545e290ea |
| children | b5a46071062a |
| files | stream/cache2.c |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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 <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 @@ -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