mirror of
https://github.com/mpv-player/mpv
synced 2024-12-28 06:03:45 +01:00
Revert declaring ThreadProc as void, it breaks the WINAPI.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27790 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
ece6db7e97
commit
2195547220
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user