Fix -Wundef warnings due to use of unguarded SDL_TIMERS_DISABLED

This commit is contained in:
Anonymous Maarten committed 2023-03-28 19:29:42 +02:00
1 parent d63f69c3b0
commit 897c40285e
2 files changed
+6 -6

No files matched your search

+5 -5
View File
@@ -47,7 +47,7 @@
#include "sensor/SDL_sensor_c.h" #include "sensor/SDL_sensor_c.h"
/* Initialization/Cleanup routines */ /* Initialization/Cleanup routines */
#if !SDL_TIMERS_DISABLED #ifndef SDL_TIMERS_DISABLED
#include "timer/SDL_timer_c.h" #include "timer/SDL_timer_c.h"
#endif #endif
#ifdef SDL_VIDEO_DRIVER_WINDOWS #ifdef SDL_VIDEO_DRIVER_WINDOWS
@@ -193,7 +193,7 @@ int SDL_InitSubSystem(Uint32 flags)
} }
#endif #endif
#if !SDL_TIMERS_DISABLED #ifndef SDL_TIMERS_DISABLED
SDL_InitTicks(); SDL_InitTicks();
#endif #endif
@@ -218,7 +218,7 @@ int SDL_InitSubSystem(Uint32 flags)
/* Initialize the timer subsystem */ /* Initialize the timer subsystem */
if (flags & SDL_INIT_TIMER) { if (flags & SDL_INIT_TIMER) {
#if !SDL_TIMERS_DISABLED && !SDL_TIMER_DUMMY #if !defined(SDL_TIMERS_DISABLED) && !SDL_TIMER_DUMMY
if (SDL_ShouldInitSubsystem(SDL_INIT_TIMER)) { if (SDL_ShouldInitSubsystem(SDL_INIT_TIMER)) {
SDL_IncrementSubsystemRefCount(SDL_INIT_TIMER); SDL_IncrementSubsystemRefCount(SDL_INIT_TIMER);
if (SDL_InitTimers() < 0) { if (SDL_InitTimers() < 0) {
@@ -429,7 +429,7 @@ void SDL_QuitSubSystem(Uint32 flags)
} }
#endif #endif
#if !SDL_TIMERS_DISABLED && !SDL_TIMER_DUMMY #if !defined(SDL_TIMERS_DISABLED) && !SDL_TIMER_DUMMY
if (flags & SDL_INIT_TIMER) { if (flags & SDL_INIT_TIMER) {
if (SDL_ShouldQuitSubsystem(SDL_INIT_TIMER)) { if (SDL_ShouldQuitSubsystem(SDL_INIT_TIMER)) {
SDL_QuitTimers(); SDL_QuitTimers();
@@ -489,7 +489,7 @@ void SDL_Quit(void)
#endif #endif
SDL_QuitSubSystem(SDL_INIT_EVERYTHING); SDL_QuitSubSystem(SDL_INIT_EVERYTHING);
#if !SDL_TIMERS_DISABLED #ifndef SDL_TIMERS_DISABLED
SDL_QuitTicks(); SDL_QuitTicks();
#endif #endif
+1 -1
View File
@@ -443,7 +443,7 @@ int SDL_VideoInit(const char *driver_name)
SDL_VideoQuit(); SDL_VideoQuit();
} }
#if !SDL_TIMERS_DISABLED #ifndef SDL_TIMERS_DISABLED
SDL_InitTicks(); SDL_InitTicks();
#endif #endif