From 897c40285e429f2fc55e4c5455caa0fb2a68a7ba Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Mon, 27 Mar 2023 14:53:01 +0200 Subject: [PATCH] Fix -Wundef warnings due to use of unguarded SDL_TIMERS_DISABLED --- src/SDL.c | 10 +++++----- src/video/SDL_video.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SDL.c b/src/SDL.c index 41b4a5240c..13bb1539c2 100644 --- a/src/SDL.c +++ b/src/SDL.c @@ -47,7 +47,7 @@ #include "sensor/SDL_sensor_c.h" /* Initialization/Cleanup routines */ -#if !SDL_TIMERS_DISABLED +#ifndef SDL_TIMERS_DISABLED #include "timer/SDL_timer_c.h" #endif #ifdef SDL_VIDEO_DRIVER_WINDOWS @@ -193,7 +193,7 @@ int SDL_InitSubSystem(Uint32 flags) } #endif -#if !SDL_TIMERS_DISABLED +#ifndef SDL_TIMERS_DISABLED SDL_InitTicks(); #endif @@ -218,7 +218,7 @@ int SDL_InitSubSystem(Uint32 flags) /* Initialize the timer subsystem */ 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)) { SDL_IncrementSubsystemRefCount(SDL_INIT_TIMER); if (SDL_InitTimers() < 0) { @@ -429,7 +429,7 @@ void SDL_QuitSubSystem(Uint32 flags) } #endif -#if !SDL_TIMERS_DISABLED && !SDL_TIMER_DUMMY +#if !defined(SDL_TIMERS_DISABLED) && !SDL_TIMER_DUMMY if (flags & SDL_INIT_TIMER) { if (SDL_ShouldQuitSubsystem(SDL_INIT_TIMER)) { SDL_QuitTimers(); @@ -489,7 +489,7 @@ void SDL_Quit(void) #endif SDL_QuitSubSystem(SDL_INIT_EVERYTHING); -#if !SDL_TIMERS_DISABLED +#ifndef SDL_TIMERS_DISABLED SDL_QuitTicks(); #endif diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c index 52ebd1638d..cd68c7b171 100644 --- a/src/video/SDL_video.c +++ b/src/video/SDL_video.c @@ -443,7 +443,7 @@ int SDL_VideoInit(const char *driver_name) SDL_VideoQuit(); } -#if !SDL_TIMERS_DISABLED +#ifndef SDL_TIMERS_DISABLED SDL_InitTicks(); #endif