Commit 09175987 authored by Sam Lantinga's avatar Sam Lantinga

Fixed declarations to match mingw includes

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401474
parent c86537b7
...@@ -52,7 +52,7 @@ typedef unsigned int uint32_t; ...@@ -52,7 +52,7 @@ typedef unsigned int uint32_t;
typedef signed long long int64_t; typedef signed long long int64_t;
typedef unsigned long long uint64_t; typedef unsigned long long uint64_t;
typedef unsigned int size_t; typedef unsigned int size_t;
typedef unsigned long uintptr_t; typedef unsigned int uintptr_t;
#endif /* _MSC_VER */ #endif /* _MSC_VER */
#define SDL_HAS_64BIT_TYPE 1 #define SDL_HAS_64BIT_TYPE 1
......
...@@ -69,6 +69,11 @@ typedef struct SDL_Thread SDL_Thread; ...@@ -69,6 +69,11 @@ typedef struct SDL_Thread SDL_Thread;
#ifdef __OS2__ #ifdef __OS2__
typedef int (*pfnSDL_CurrentBeginThread)(void (*func)(void *), void *, unsigned, void *arg); typedef int (*pfnSDL_CurrentBeginThread)(void (*func)(void *), void *, unsigned, void *arg);
typedef void (*pfnSDL_CurrentEndThread)(void); typedef void (*pfnSDL_CurrentEndThread)(void);
#elif __GNUC__
typedef unsigned long (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
unsigned (__stdcall *func)(void *), void *arg,
unsigned, unsigned *threadID);
typedef void (__cdecl *pfnSDL_CurrentEndThread)(unsigned code);
#else #else
typedef uintptr_t (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned, typedef uintptr_t (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
unsigned (__stdcall *func)(void *), void *arg, unsigned (__stdcall *func)(void *), void *arg,
......
...@@ -59,16 +59,16 @@ static unsigned __stdcall RunThread(void *data) ...@@ -59,16 +59,16 @@ static unsigned __stdcall RunThread(void *data)
int SDL_SYS_CreateThread(SDL_Thread *thread, void *args, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread) int SDL_SYS_CreateThread(SDL_Thread *thread, void *args, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread)
{ {
unsigned threadid; unsigned threadid;
pThreadStartParms pThreadParms = (pThreadStartParms)SDL_malloc(sizeof(tThreadStartParms)); pThreadStartParms pThreadParms = (pThreadStartParms)SDL_malloc(sizeof(tThreadStartParms));
if (!pThreadParms) { if (!pThreadParms) {
SDL_OutOfMemory(); SDL_OutOfMemory();
return(-1); return(-1);
} }
// Save the function which we will have to call to clear the RTL of calling app! // Save the function which we will have to call to clear the RTL of calling app!
pThreadParms->pfnCurrentEndThread = pfnEndThread; pThreadParms->pfnCurrentEndThread = pfnEndThread;
// Also save the real parameters we have to pass to thread function // Also save the real parameters we have to pass to thread function
pThreadParms->args = args; pThreadParms->args = args;
if (pfnBeginThread) { if (pfnBeginThread) {
thread->handle = (SYS_ThreadHandle) pfnBeginThread(NULL, 0, RunThread, thread->handle = (SYS_ThreadHandle) pfnBeginThread(NULL, 0, RunThread,
......
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