Merge commit '67d517907bf8662395edf88c2137b8b0bc74d9e8' into main

main
Sam Lantinga 2023-01-11 22:16:23 -08:00
commit b963ab56a8
1 changed files with 9 additions and 0 deletions

View File

@ -65,6 +65,11 @@ static SDL_LogOutputFunction SDL_log_function = SDL_LogOutput;
static void *SDL_log_userdata = NULL; static void *SDL_log_userdata = NULL;
static SDL_mutex *log_function_mutex = NULL; static SDL_mutex *log_function_mutex = NULL;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-variable"
#endif
static const char *SDL_priority_prefixes[SDL_NUM_LOG_PRIORITIES] = { static const char *SDL_priority_prefixes[SDL_NUM_LOG_PRIORITIES] = {
NULL, NULL,
"VERBOSE", "VERBOSE",
@ -75,6 +80,10 @@ static const char *SDL_priority_prefixes[SDL_NUM_LOG_PRIORITIES] = {
"CRITICAL" "CRITICAL"
}; };
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#ifdef __ANDROID__ #ifdef __ANDROID__
static const char *SDL_category_prefixes[] = { static const char *SDL_category_prefixes[] = {
"APP", "APP",