Commit 1d518f0d authored by Sam Lantinga's avatar Sam Lantinga

Fixed compiling under Visual Studio

parent e253e1d9
...@@ -224,7 +224,13 @@ SDL_TimerInit(void) ...@@ -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;
......
...@@ -24,6 +24,7 @@ ...@@ -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"
......
...@@ -526,7 +526,6 @@ static int FIFO_Reader(void* _data) ...@@ -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 ( ; ; ) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment