geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant 'SDL_GetErrBuf' declaration

Sylvain Becker 2019-10-30 17:35:40 +01:00
parent 9e509e4a4f
commit 81cdd50002
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/SDL_error.c
View File

@ -26,16 +26,6 @@
#include "SDL_error.h" #include "SDL_error.h"
#include "SDL_error_c.h" #include "SDL_error_c.h"
/* Routine to get the thread-specific error variable */
#if SDL_THREADS_DISABLED
/* The default (non-thread-safe) global error variable */
static SDL_error SDL_global_error;
#define SDL_GetErrBuf() (&SDL_global_error)
#else
extern SDL_error *SDL_GetErrBuf(void);
#endif /* SDL_THREADS_DISABLED */
#define SDL_ERRBUFIZE 1024 #define SDL_ERRBUFIZE 1024
/* Private functions */ /* Private functions */

6
src/thread/SDL_thread.c
View File

@ -205,6 +205,11 @@ SDL_Generic_SetTLSData(SDL_TLSData *storage)
SDL_error * SDL_error *
SDL_GetErrBuf(void) SDL_GetErrBuf(void)
{ {
#if SDL_THREADS_DISABLED
/* Non-thread-safe global error variable */
static SDL_error SDL_global_error;
return &SDL_global_error;
#else
static SDL_SpinLock tls_lock; static SDL_SpinLock tls_lock;
static SDL_bool tls_being_created; static SDL_bool tls_being_created;
static SDL_TLSID tls_errbuf; static SDL_TLSID tls_errbuf;
@ -249,6 +254,7 @@ SDL_GetErrBuf(void)
SDL_TLSSet(tls_errbuf, errbuf, SDL_free); SDL_TLSSet(tls_errbuf, errbuf, SDL_free);
} }
return errbuf; return errbuf;
#endif /* SDL_THREADS_DISABLED */
} }