From e40f54f06be98d0ecb40bae42927e4213d26226b Mon Sep 17 00:00:00 2001
From: Misa <infoteddy@infoteddy.info>
Date: Thu, 11 Nov 2021 23:52:47 -0800
Subject: [PATCH] Remove temporary SDL fallthrough

We don't need a temporary fallback if we just start using SDL 2.0.18 or
later.
---
 desktop_version/src/Graphics.cpp         |  2 +-
 desktop_version/src/TempSDLFallthrough.h | 22 ----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 desktop_version/src/TempSDLFallthrough.h

diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp
index 763a2602..81c6064c 100644
--- a/desktop_version/src/Graphics.cpp
+++ b/desktop_version/src/Graphics.cpp
@@ -1,6 +1,7 @@
 #define GRAPHICS_DEFINITION
 #include "Graphics.h"
 
+#include <SDL.h>
 #include <utf8/unchecked.h>
 
 #include "Constants.h"
@@ -12,7 +13,6 @@
 #include "Map.h"
 #include "Music.h"
 #include "Screen.h"
-#include "TempSDLFallthrough.h"
 #include "UtilityClass.h"
 #include "Vlogging.h"
 
diff --git a/desktop_version/src/TempSDLFallthrough.h b/desktop_version/src/TempSDLFallthrough.h
deleted file mode 100644
index 20d78817..00000000
--- a/desktop_version/src/TempSDLFallthrough.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef TEMPSDLFALLTHROUGH_H
-#define TEMPSDLFALLTHROUGH_H
-
-/* FIXME: Delete this when SDL 2.0.18 releases! */
-
-#include <SDL_stdinc.h>
-
-#ifndef SDL_FALLTHROUGH
-#   ifndef __has_attribute
-#      define __has_attribute(x) 0
-#   endif
-
-#   if __has_attribute(__fallthrough__)
-#      define VVV_fallthrough __attribute__((__fallthrough__))
-#   else
-#      define VVV_fallthrough do { } while (false) /* fallthrough */
-#   endif
-
-#   define SDL_FALLTHROUGH VVV_fallthrough
-#endif
-
-#endif /* TEMPSDLFALLTHROUGH_H */