From 81cdd5000202d70f37187a034b86709eee84e1f2 Mon Sep 17 00:00:00 2001 From: Sylvain Becker Date: Wed, 30 Oct 2019 17:35:40 +0100 Subject: [PATCH] Remove redundant 'SDL_GetErrBuf' declaration --- src/SDL_error.c | 10 ---------- src/thread/SDL_thread.c | 6 ++++++ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/SDL_error.c b/src/SDL_error.c index f3f481bd1bffb..cc850745a70ad 100644 --- a/src/SDL_error.c +++ b/src/SDL_error.c @@ -26,16 +26,6 @@ #include "SDL_error.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 /* Private functions */ diff --git a/src/thread/SDL_thread.c b/src/thread/SDL_thread.c index f7eb4ee23b245..c52477644a870 100644 --- a/src/thread/SDL_thread.c +++ b/src/thread/SDL_thread.c @@ -205,6 +205,11 @@ SDL_Generic_SetTLSData(SDL_TLSData *storage) SDL_error * 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_bool tls_being_created; static SDL_TLSID tls_errbuf; @@ -249,6 +254,7 @@ SDL_GetErrBuf(void) SDL_TLSSet(tls_errbuf, errbuf, SDL_free); } return errbuf; +#endif /* SDL_THREADS_DISABLED */ }