src/thread/SDL_thread.c
changeset 1330 450721ad5436
parent 1312 c9b51268668f
child 1336 3692456e7b0f
     1.1 --- a/src/thread/SDL_thread.c	Sat Feb 04 22:01:44 2006 +0000
     1.2 +++ b/src/thread/SDL_thread.c	Mon Feb 06 08:28:51 2006 +0000
     1.3 @@ -22,13 +22,11 @@
     1.4  
     1.5  /* System independent thread management routines for SDL */
     1.6  
     1.7 -#include <stdio.h>
     1.8 -#include <stdlib.h>
     1.9 -#include <string.h>
    1.10 -
    1.11  #include "SDL_error.h"
    1.12  #include "SDL_mutex.h"
    1.13  #include "SDL_thread.h"
    1.14 +#include "SDL_stdlib.h"
    1.15 +#include "SDL_string.h"
    1.16  #include "SDL_thread_c.h"
    1.17  #include "SDL_systhread.h"
    1.18  
    1.19 @@ -213,8 +211,9 @@
    1.20  	*statusloc = userfunc(userdata);
    1.21  }
    1.22  
    1.23 -#ifdef __OS2__
    1.24 -DECLSPEC SDL_Thread * SDLCALL SDL_CreateThread_Core(int (*fn)(void *), void *data, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread)
    1.25 +#if defined(_WIN32) || defined(__OS2__)
    1.26 +#undef SDL_CreateThread
    1.27 +DECLSPEC SDL_Thread * SDLCALL SDL_CreateThread(int (*fn)(void *), void *data, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread)
    1.28  #else
    1.29  DECLSPEC SDL_Thread * SDLCALL SDL_CreateThread(int (*fn)(void *), void *data)
    1.30  #endif
    1.31 @@ -253,8 +252,8 @@
    1.32  	SDL_AddThread(thread);
    1.33  
    1.34  	/* Create the thread and go! */
    1.35 -#ifdef __OS2__
    1.36 -        ret = SDL_SYS_CreateThread(thread, args, pfnBeginThread, pfnEndThread);
    1.37 +#if defined(_WIN32) || defined(__OS2__)
    1.38 +	ret = SDL_SYS_CreateThread(thread, args, pfnBeginThread, pfnEndThread);
    1.39  #else
    1.40  	ret = SDL_SYS_CreateThread(thread, args);
    1.41  #endif