4 files changed, 0 insertions, 33 deletions
diff --git a/src/input_common/sdl/sdl_impl.h b/src/input_common/sdl/sdl_impl.h
index b77afcbd8..7a9ad6346 100644
--- a/src/input_common/sdl/sdl_impl.h
+++ b/src/input_common/sdl/sdl_impl.h
@@ -10,15 +10,7 @@
 #include <thread>
 #include <unordered_map>
-// Ignore -Wimplicit-fallthrough due to https://github.com/libsdl-org/SDL/issues/4307
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
-#endif
 #include <SDL.h>
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
 #include "common/common_types.h"
 #include "common/threadsafe_queue.h"
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
index 06b20c975..896181f0b 100644
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
@@ -2,15 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
-// 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 "common/logging/log.h"
 #include "common/scm_rev.h"
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp
index 837a44be7..eadb41790 100644
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp
@@ -7,15 +7,7 @@
 #include <string>
 #define SDL_MAIN_HANDLED
-// 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 <fmt/format.h>
 #include <glad/glad.h>
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp
index 7c870aea1..152e56db8 100644
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp
@@ -21,16 +21,7 @@
 #include <SDL_config.h>
 #endif
-// Include these late to avoid polluting everything with Xlib macros
-// 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 <SDL_syswm.h>
 EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsystem)

diff --git a/src/input_common/sdl/sdl_impl.h b/src/input_common/sdl/sdl_impl.h index b77afcbd8..7a9ad6346 100644 --- a/src/input_common/sdl/sdl_impl.h +++ b/src/input_common/sdl/sdl_impl.h
@@ -10,15 +10,7 @@
10	#include <thread>	10	#include <thread>
11	#include <unordered_map>	11	#include <unordered_map>
12		12
13	// Ignore -Wimplicit-fallthrough due to https://github.com/libsdl-org/SDL/issues/4307
14	#ifdef __GNUC__
15	#pragma GCC diagnostic push
16	#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
17	#endif
18	#include <SDL.h>	13	#include <SDL.h>
19	#ifdef __GNUC__
20	#pragma GCC diagnostic pop
21	#endif
22		14
23	#include "common/common_types.h"	15	#include "common/common_types.h"
24	#include "common/threadsafe_queue.h"	16	#include "common/threadsafe_queue.h"


diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp index 06b20c975..896181f0b 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
@@ -2,15 +2,7 @@
2	// Licensed under GPLv2 or any later version	2	// Licensed under GPLv2 or any later version
3	// Refer to the license.txt file included.	3	// Refer to the license.txt file included.
4		4
5	// Ignore -Wimplicit-fallthrough due to https://github.com/libsdl-org/SDL/issues/4307
6	#ifdef __clang__
7	#pragma clang diagnostic push
8	#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
9	#endif
10	#include <SDL.h>	5	#include <SDL.h>
11	#ifdef __clang__
12	#pragma clang diagnostic pop
13	#endif
14		6
15	#include "common/logging/log.h"	7	#include "common/logging/log.h"
16	#include "common/scm_rev.h"	8	#include "common/scm_rev.h"


diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp index 837a44be7..eadb41790 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp
@@ -7,15 +7,7 @@
7	#include <string>	7	#include <string>
8		8
9	#define SDL_MAIN_HANDLED	9	#define SDL_MAIN_HANDLED
10	// Ignore -Wimplicit-fallthrough due to https://github.com/libsdl-org/SDL/issues/4307
11	#ifdef __clang__
12	#pragma clang diagnostic push
13	#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
14	#endif
15	#include <SDL.h>	10	#include <SDL.h>
16	#ifdef __clang__
17	#pragma clang diagnostic pop
18	#endif
19		11
20	#include <fmt/format.h>	12	#include <fmt/format.h>
21	#include <glad/glad.h>	13	#include <glad/glad.h>


diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp index 7c870aea1..152e56db8 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp
@@ -21,16 +21,7 @@
21	#include <SDL_config.h>	21	#include <SDL_config.h>
22	#endif	22	#endif
23		23
24	// Include these late to avoid polluting everything with Xlib macros
25	// Ignore -Wimplicit-fallthrough due to https://github.com/libsdl-org/SDL/issues/4307
26	#ifdef __clang__
27	#pragma clang diagnostic push
28	#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
29	#endif
30	#include <SDL.h>	24	#include <SDL.h>
31	#ifdef __clang__
32	#pragma clang diagnostic pop
33	#endif
34	#include <SDL_syswm.h>	25	#include <SDL_syswm.h>
35		26
36	EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsystem)	27	EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsystem)