From abdbaf605e39c2e1256f9a36171af01da27c4873 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@gmail.com>
Date: Mon, 6 Mar 2023 16:29:53 +0100
Subject: [PATCH] player/Thread, ...: assume [[fallthrough]] is supported

---
 src/input/plugins/AlsaInputPlugin.cxx   | 3 +--
 src/output/plugins/AlsaOutputPlugin.cxx | 3 +--
 src/player/Thread.cxx                   | 3 ---
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/input/plugins/AlsaInputPlugin.cxx b/src/input/plugins/AlsaInputPlugin.cxx
index 86659cdcf..ebc359595 100644
--- a/src/input/plugins/AlsaInputPlugin.cxx
+++ b/src/input/plugins/AlsaInputPlugin.cxx
@@ -276,9 +276,8 @@ AlsaInputStream::Recover(int err)
 		if (err == -EAGAIN)
 			return 0;
 		/* fall-through to snd_pcm_prepare: */
-#if CLANG_OR_GCC_VERSION(7,0)
 		[[fallthrough]];
-#endif
+
 	case SND_PCM_STATE_OPEN:
 	case SND_PCM_STATE_SETUP:
 	case SND_PCM_STATE_XRUN:
diff --git a/src/output/plugins/AlsaOutputPlugin.cxx b/src/output/plugins/AlsaOutputPlugin.cxx
index f510d41fc..6f1c6be1f 100644
--- a/src/output/plugins/AlsaOutputPlugin.cxx
+++ b/src/output/plugins/AlsaOutputPlugin.cxx
@@ -908,9 +908,8 @@ AlsaOutput::Recover(int err) noexcept
 		if (err == -EAGAIN)
 			return 0;
 		/* fall-through to snd_pcm_prepare: */
-#if CLANG_OR_GCC_VERSION(7,0)
 		[[fallthrough]];
-#endif
+
 	case SND_PCM_STATE_OPEN:
 	case SND_PCM_STATE_SETUP:
 	case SND_PCM_STATE_XRUN:
diff --git a/src/player/Thread.cxx b/src/player/Thread.cxx
index 7588ad779..6e57ecb4a 100644
--- a/src/player/Thread.cxx
+++ b/src/player/Thread.cxx
@@ -30,7 +30,6 @@
 #include "CrossFade.hxx"
 #include "pcm/MixRampGlue.hxx"
 #include "tag/Tag.hxx"
-#include "util/Compiler.h"
 #include "util/Domain.hxx"
 #include "thread/Name.hxx"
 #include "Log.hxx"
@@ -1279,9 +1278,7 @@ try {
 			}
 
 			/* fall through */
-#if CLANG_OR_GCC_VERSION(7,0)
 			[[fallthrough]];
-#endif
 
 		case PlayerCommand::PAUSE:
 			next_song.reset();