SDL_KillThread() is no longer supported - it was always dangerous! :)

libsdl-org · May 25, 2010 · 5282223 · 5282223
1 parent 0f72df7
commit 5282223
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 17 deletions.
diff --git a/include/SDL_compat.h b/include/SDL_compat.h
@@ -324,6 +324,7 @@ extern DECLSPEC int SDLCALL SDL_EnableUNICODE(int enable);
 #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 --git a/include/SDL_thread.h b/include/SDL_thread.h
@@ -149,16 +149,6 @@ extern DECLSPEC SDL_threadID SDLCALL SDL_GetThreadID(SDL_Thread * thread);
  */
 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 --git a/src/SDL_compat.c b/src/SDL_compat.c
@@ -1750,7 +1750,6 @@ SDL_EnableUNICODE(int enable)
     return previous;
 }
 
-
 int
 SDL_putenv(const char *_var)
 {

diff --git a/src/thread/SDL_thread.c b/src/thread/SDL_thread.c
@@ -305,10 +305,4 @@ SDL_GetThreadID(SDL_Thread * thread)
     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: */