SDL: sync handling of subsystems II.

From eb80f2c65ab81dde522a83fabf4881469a8364d2 Mon Sep 17 00:00:00 2001
From: pionere <[EMAIL REDACTED]>
Date: Tue, 11 Jan 2022 10:45:41 +0100
Subject: [PATCH] sync handling of subsystems II.

---
 CMakeLists.txt                  | 4 ++--
 configure                       | 2 +-
 configure.ac                    | 2 +-
 src/SDL.c                       | 4 ++--
 src/video/SDL_vulkan_internal.h | 8 +++-----
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 20119d717c9..0dfb408dfb5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2563,7 +2563,7 @@ if(NOT HAVE_SDL_SENSORS)
   set(SOURCE_FILES ${SOURCE_FILES} ${SENSORS_SOURCES})
 endif()
 if(NOT HAVE_SDL_LOADSO)
-  set(SDL_LOADSO_DISABLED 1)
+  set(SDL_LOADSO_DUMMY 1)
   file(GLOB LOADSO_SOURCES ${SDL2_SOURCE_DIR}/src/loadso/dummy/*.c)
   set(SOURCE_FILES ${SOURCE_FILES} ${LOADSO_SOURCES})
 endif()
@@ -2590,7 +2590,7 @@ if(NOT HAVE_SDL_THREADS)
   set(SOURCE_FILES ${SOURCE_FILES} ${THREADS_SOURCES})
 endif()
 if(NOT HAVE_SDL_TIMERS)
-  set(SDL_TIMERS_DISABLED 1)
+  set(SDL_TIMER_DUMMY 1)
   file(GLOB TIMER_SOURCES ${SDL2_SOURCE_DIR}/src/timer/dummy/*.c)
   set(SOURCE_FILES ${SOURCE_FILES} ${TIMER_SOURCES})
 endif()
diff --git a/configure b/configure
index 70f786ce409..57265c19189 100755
--- a/configure
+++ b/configure
@@ -26931,7 +26931,7 @@ fi
 if test x$have_timers != xyes; then
     if test x$enable_timers = xyes; then
 
-$as_echo "#define SDL_TIMERS_DISABLED 1" >>confdefs.h
+$as_echo "#define SDL_TIMER_DUMMY 1" >>confdefs.h
 
     fi
     SOURCES="$SOURCES $srcdir/src/timer/dummy/*.c"
diff --git a/configure.ac b/configure.ac
index 87ecb196254..568ca9ad9b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4588,7 +4588,7 @@ if test x$have_threads != xyes; then
 fi
 if test x$have_timers != xyes; then
     if test x$enable_timers = xyes; then
-        AC_DEFINE(SDL_TIMERS_DISABLED, 1, [ ])
+        AC_DEFINE(SDL_TIMER_DUMMY, 1, [ ])
     fi
     SOURCES="$SOURCES $srcdir/src/timer/dummy/*.c"
 fi
diff --git a/src/SDL.c b/src/SDL.c
index 67afa67aa5c..d3d60fbf080 100644
--- a/src/SDL.c
+++ b/src/SDL.c
@@ -208,7 +208,7 @@ SDL_InitSubSystem(Uint32 flags)
 
     /* Initialize the timer subsystem */
     if ((flags & SDL_INIT_TIMER)){
-#if !SDL_TIMERS_DISABLED
+#if !SDL_TIMERS_DISABLED && !SDL_TIMER_DUMMY
         if (SDL_PrivateShouldInitSubsystem(SDL_INIT_TIMER)) {
             if (SDL_TimerInit() < 0) {
                 goto quit_and_error;
@@ -402,7 +402,7 @@ SDL_QuitSubSystem(Uint32 flags)
     }
 #endif
 
-#if !SDL_TIMERS_DISABLED
+#if !SDL_TIMERS_DISABLED && !SDL_TIMER_DUMMY
     if ((flags & SDL_INIT_TIMER)) {
         if (SDL_PrivateShouldQuitSubsystem(SDL_INIT_TIMER)) {
             SDL_TimerQuit();
diff --git a/src/video/SDL_vulkan_internal.h b/src/video/SDL_vulkan_internal.h
index 52fae34da07..1ec1ab47330 100644
--- a/src/video/SDL_vulkan_internal.h
+++ b/src/video/SDL_vulkan_internal.h
@@ -25,12 +25,10 @@
 
 #include "SDL_stdinc.h"
 
-#if defined(SDL_LOADSO_DISABLED)
-#undef SDL_VIDEO_VULKAN
-#define SDL_VIDEO_VULKAN 0
-#endif
-
 #if SDL_VIDEO_VULKAN
+#if SDL_LOADSO_DISABLED || SDL_LOADSO_DUMMY
+#error You should not be here.
+#endif
 
 #if SDL_VIDEO_DRIVER_ANDROID
 #define VK_USE_PLATFORM_ANDROID_KHR