pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed compiling under Visual Studio

Browse source
This commit is contained in:
Sam Lantinga 2011-01-27 15:31:00 -08:00
parent e253e1d991
commit 1d518f0d73
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/timer/SDL_timer.c
View file

@ -224,7 +224,13 @@ SDL_TimerInit(void)
} }
data->active = SDL_TRUE; data->active = SDL_TRUE;
/* !!! FIXME: this is nasty. */
#if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
#undef SDL_CreateThread
data->thread = SDL_CreateThread(SDL_TimerThread, data, NULL, NULL);
#else
data->thread = SDL_CreateThread(SDL_TimerThread, data); data->thread = SDL_CreateThread(SDL_TimerThread, data);
#endif
if (!data->thread) { if (!data->thread) {
SDL_TimerQuit(); SDL_TimerQuit();
return -1; return -1;

1
src/timer/windows/SDL_systimer.c
View file

@ -24,6 +24,7 @@
#ifdef SDL_TIMER_WINDOWS #ifdef SDL_TIMER_WINDOWS
#include "../../core/windows/SDL_windows.h" #include "../../core/windows/SDL_windows.h"
#include <mmsystem.h>
#include "SDL_timer.h" #include "SDL_timer.h"

1
test/testatomic.c
View file

@ -526,7 +526,6 @@ static int FIFO_Reader(void* _data)
ReaderData *data = (ReaderData *)_data; ReaderData *data = (ReaderData *)_data;
SDL_EventQueue *queue = data->queue; SDL_EventQueue *queue = data->queue;
SDL_Event event; SDL_Event event;
int index;
if (data->lock_free) { if (data->lock_free) {
for ( ; ; ) { for ( ; ; ) {