From 40113b03d3f1f67c8f3cc892e421286b099bb717 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Mon, 27 Mar 2023 14:58:06 +0200 Subject: [PATCH] Fix -Wundef warnings due to use of unguarded SDL_AUDIO_DISABLED --- src/SDL.c | 4 ++-- src/video/android/SDL_androidevents.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/SDL.c b/src/SDL.c index c27ad809c5..062a3cb361 100644 --- a/src/SDL.c +++ b/src/SDL.c @@ -256,7 +256,7 @@ int SDL_InitSubSystem(Uint32 flags) /* Initialize the audio subsystem */ if (flags & SDL_INIT_AUDIO) { -#if !SDL_AUDIO_DISABLED +#ifndef SDL_AUDIO_DISABLED if (SDL_ShouldInitSubsystem(SDL_INIT_AUDIO)) { SDL_IncrementSubsystemRefCount(SDL_INIT_AUDIO); if (SDL_InitAudio(NULL) < 0) { @@ -405,7 +405,7 @@ void SDL_QuitSubSystem(Uint32 flags) } #endif -#if !SDL_AUDIO_DISABLED +#ifndef SDL_AUDIO_DISABLED if (flags & SDL_INIT_AUDIO) { /* audio implies events */ flags |= SDL_INIT_EVENTS; diff --git a/src/video/android/SDL_androidevents.c b/src/video/android/SDL_androidevents.c index 6170a67680..a46dde056b 100644 --- a/src/video/android/SDL_androidevents.c +++ b/src/video/android/SDL_androidevents.c @@ -31,7 +31,7 @@ /* Can't include sysaudio "../../audio/android/SDL_androidaudio.h" * because of THIS redefinition */ -#if !SDL_AUDIO_DISABLED && SDL_AUDIO_DRIVER_ANDROID +#if !defined(SDL_AUDIO_DISABLED) && SDL_AUDIO_DRIVER_ANDROID extern void ANDROIDAUDIO_ResumeDevices(void); extern void ANDROIDAUDIO_PauseDevices(void); #else @@ -39,7 +39,7 @@ static void ANDROIDAUDIO_ResumeDevices(void) {} static void ANDROIDAUDIO_PauseDevices(void) {} #endif -#if !SDL_AUDIO_DISABLED && SDL_AUDIO_DRIVER_OPENSLES +#if !defined(SDL_AUDIO_DISABLED) && SDL_AUDIO_DRIVER_OPENSLES extern void openslES_ResumeDevices(void); extern void openslES_PauseDevices(void); #else @@ -49,7 +49,7 @@ static void openslES_ResumeDevices(void) static void openslES_PauseDevices(void) {} #endif -#if !SDL_AUDIO_DISABLED && SDL_AUDIO_DRIVER_AAUDIO +#if !defined(SDL_AUDIO_DISABLED) && SDL_AUDIO_DRIVER_AAUDIO extern void aaudio_ResumeDevices(void); extern void aaudio_PauseDevices(void); SDL_bool aaudio_DetectBrokenPlayState(void);