admin/SDL
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix -Wundef warnings due to use of unguarded SDL_AUDIO_DISABLED

Browse Source
This commit is contained in:
Anonymous Maarten committed 2023-03-28 19:29:43 +02:00
1 parent 2b39d63f27
commit 40113b03d3
2 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/SDL.c
+2 -2
View File
@@ -256,7 +256,7 @@ int SDL_InitSubSystem(Uint32 flags)
/* Initialize the audio subsystem */ /* Initialize the audio subsystem */
if (flags & SDL_INIT_AUDIO) { if (flags & SDL_INIT_AUDIO) {
#if !SDL_AUDIO_DISABLED #ifndef SDL_AUDIO_DISABLED
if (SDL_ShouldInitSubsystem(SDL_INIT_AUDIO)) { if (SDL_ShouldInitSubsystem(SDL_INIT_AUDIO)) {
SDL_IncrementSubsystemRefCount(SDL_INIT_AUDIO); SDL_IncrementSubsystemRefCount(SDL_INIT_AUDIO);
if (SDL_InitAudio(NULL) < 0) { if (SDL_InitAudio(NULL) < 0) {
@@ -405,7 +405,7 @@ void SDL_QuitSubSystem(Uint32 flags)
} }
#endif #endif
#if !SDL_AUDIO_DISABLED #ifndef SDL_AUDIO_DISABLED
if (flags & SDL_INIT_AUDIO) { if (flags & SDL_INIT_AUDIO) {
/* audio implies events */ /* audio implies events */
flags |= SDL_INIT_EVENTS; flags |= SDL_INIT_EVENTS;
src/video/android/SDL_androidevents.c
+3 -3
View File
@@ -31,7 +31,7 @@
/* Can't include sysaudio "../../audio/android/SDL_androidaudio.h" /* Can't include sysaudio "../../audio/android/SDL_androidaudio.h"
* because of THIS redefinition */ * 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_ResumeDevices(void);
extern void ANDROIDAUDIO_PauseDevices(void); extern void ANDROIDAUDIO_PauseDevices(void);
#else #else
@@ -39,7 +39,7 @@ static void ANDROIDAUDIO_ResumeDevices(void) {}
static void ANDROIDAUDIO_PauseDevices(void) {} static void ANDROIDAUDIO_PauseDevices(void) {}
#endif #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_ResumeDevices(void);
extern void openslES_PauseDevices(void); extern void openslES_PauseDevices(void);
#else #else
@@ -49,7 +49,7 @@ static void openslES_ResumeDevices(void)
static void openslES_PauseDevices(void) {} static void openslES_PauseDevices(void) {}
#endif #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_ResumeDevices(void);
extern void aaudio_PauseDevices(void); extern void aaudio_PauseDevices(void);
SDL_bool aaudio_DetectBrokenPlayState(void); SDL_bool aaudio_DetectBrokenPlayState(void);