# HG changeset patch # User Sam Lantinga # Date 1274766996 25200 # Node ID 82f357a91d43f2a9cd502724c291956cc368f024 # Parent 0baef09fe7021d288a9fa064cba6d6dcf4ba7473 SDL_KillThread() is no longer supported - it was always dangerous! :) diff -r 0baef09fe702 -r 82f357a91d43 include/SDL_compat.h --- a/include/SDL_compat.h Mon May 17 23:13:33 2010 -0700 +++ b/include/SDL_compat.h Mon May 24 22:56:36 2010 -0700 @@ -324,6 +324,7 @@ #define SDL_RenderPoint SDL_RenderDrawPoint #define SDL_RenderLine SDL_RenderDrawLine #define SDL_RenderFill(X) (X) ? SDL_RenderFillRect(X) : SDL_RenderClear() +#define SDL_KillThread(X) extern DECLSPEC int SDLCALL SDL_putenv(const char *variable); diff -r 0baef09fe702 -r 82f357a91d43 include/SDL_thread.h --- a/include/SDL_thread.h Mon May 17 23:13:33 2010 -0700 +++ b/include/SDL_thread.h Mon May 24 22:56:36 2010 -0700 @@ -149,16 +149,6 @@ */ extern DECLSPEC void SDLCALL SDL_WaitThread(SDL_Thread * thread, int *status); -/** - * \deprecated This function is here for binary compatibility with legacy apps, - * but in SDL 1.3 and later, it's a no-op. - * - * You cannot forcibly kill a thread in a safe manner on many platforms. You - * should instead find a way to alert your thread that it is time to terminate, - * and then have it gracefully exit on its own. Do not ever call this function! - */ -extern DECLSPEC void SDLCALL SDL_KillThread(SDL_Thread * thread); - /* Ends C function definitions when using C++ */ #ifdef __cplusplus diff -r 0baef09fe702 -r 82f357a91d43 src/SDL_compat.c --- a/src/SDL_compat.c Mon May 17 23:13:33 2010 -0700 +++ b/src/SDL_compat.c Mon May 24 22:56:36 2010 -0700 @@ -1750,7 +1750,6 @@ return previous; } - int SDL_putenv(const char *_var) { diff -r 0baef09fe702 -r 82f357a91d43 src/thread/SDL_thread.c --- a/src/thread/SDL_thread.c Mon May 17 23:13:33 2010 -0700 +++ b/src/thread/SDL_thread.c Mon May 24 22:56:36 2010 -0700 @@ -305,10 +305,4 @@ return id; } -void -SDL_KillThread(SDL_Thread * thread) -{ - /* This is a no-op in SDL 1.3 and later. */ -} - /* vi: set ts=4 sw=4 expandtab: */