summaryrefslogtreecommitdiffstats
path: root/stream/cache2.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-10-13 15:51:29 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-10-13 15:51:29 +0000
commit9214b77133591ef363bd13eda0da68782244dd5d (patch)
tree936504ea335b29549a02aeb275fc542e7b7c2da2 /stream/cache2.c
parentbc7cf2efd85d4f1a88892cff71294adb4bc44a86 (diff)
downloadmpv-9214b77133591ef363bd13eda0da68782244dd5d.tar.bz2
mpv-9214b77133591ef363bd13eda0da68782244dd5d.tar.xz
Declare ThreadProc as void, it does not return anything, fixes the warning:
stream/cache2.c:364: warning: control reaches end of non-void function git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27759 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/cache2.c')
-rw-r--r--stream/cache2.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/stream/cache2.c b/stream/cache2.c
index aff5a93a6f..37889acaa0 100644
--- a/stream/cache2.c
+++ b/stream/cache2.c
@@ -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,int size,int min,int seek_limit){
#if defined(WIN32) || defined(__OS2__)
}
-#ifdef WIN32
-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