diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-05-07 05:10:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-07 05:10:09 +0200 |
| commit | 27ff00acb1b38b6ac279cce2451c1c06ea9af5b1 (patch) | |
| tree | ed37001e5ec773299f039f1561e091911705f9e7 | |
| parent | Merge pull request #10165 from merryhime/update-dynarmic (diff) | |
| parent | yuzu-sdl,audio_core: Remove antiquated warning ignore (diff) | |
| download | yuzu-27ff00acb1b38b6ac279cce2451c1c06ea9af5b1.tar yuzu-27ff00acb1b38b6ac279cce2451c1c06ea9af5b1.tar.gz yuzu-27ff00acb1b38b6ac279cce2451c1c06ea9af5b1.tar.bz2 yuzu-27ff00acb1b38b6ac279cce2451c1c06ea9af5b1.tar.lz yuzu-27ff00acb1b38b6ac279cce2451c1c06ea9af5b1.tar.xz yuzu-27ff00acb1b38b6ac279cce2451c1c06ea9af5b1.tar.zst yuzu-27ff00acb1b38b6ac279cce2451c1c06ea9af5b1.zip | |
| -rw-r--r-- | src/audio_core/sink/sdl2_sink.cpp | 11 | ||||
| -rw-r--r-- | src/yuzu_cmd/config.cpp | 12 |
2 files changed, 2 insertions, 21 deletions
diff --git a/src/audio_core/sink/sdl2_sink.cpp b/src/audio_core/sink/sdl2_sink.cpp index ee1a0652f..c1529d1f9 100644 --- a/src/audio_core/sink/sdl2_sink.cpp +++ b/src/audio_core/sink/sdl2_sink.cpp @@ -3,6 +3,7 @@ #include <span> #include <vector> +#include <SDL.h> #include "audio_core/common/common.h" #include "audio_core/sink/sdl2_sink.h" @@ -10,16 +11,6 @@ #include "common/logging/log.h" #include "core/core.h" -// Ignore -Wimplicit-fallthrough due to https://github.com/libsdl-org/SDL/issues/4307 -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wimplicit-fallthrough" -#endif -#include <SDL.h> -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - namespace AudioCore::Sink { /** * SDL sink stream, responsible for sinking samples to hardware. diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index 605280949..352e6a4c7 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp @@ -4,18 +4,8 @@ #include <memory> #include <optional> #include <sstream> - -// Ignore -Wimplicit-fallthrough due to https://github.com/libsdl-org/SDL/issues/4307 -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wimplicit-fallthrough" -#endif -#include <SDL.h> -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - #include <INIReader.h> +#include <SDL.h> #include "common/fs/file.h" #include "common/fs/fs.h" #include "common/fs/path_util.h" |