diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-10-16 19:24:21 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-10-16 19:24:21 +0000 |
| commit | 2195547220674940ef20e9ea38bb3610541d04b3 (patch) | |
| tree | 8356a1156eb7464f41b2fbd6019e89f033ad53a9 /stream/cache2.c | |
| parent | ece6db7e97751c09972f91486dc31465676a1ead (diff) | |
| download | mpv-2195547220674940ef20e9ea38bb3610541d04b3.tar.bz2 mpv-2195547220674940ef20e9ea38bb3610541d04b3.tar.xz | |
Revert declaring ThreadProc as void, it breaks the WINAPI.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27790 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/cache2.c')
| -rw-r--r-- | stream/cache2.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/stream/cache2.c b/stream/cache2.c index dd2423d765..7decd32d01 100644 --- a/stream/cache2.c +++ b/stream/cache2.c @@ -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 @@ 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: @@ -361,9 +362,12 @@ int stream_enable_cache(stream_t *stream,int size,int min,int seek_limit){ #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 |