mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-09 10:29:45 +01:00
Code Issues Releases Wiki Activity

Use SDL_FALLTHROUGH if available

Browse source 
The SDL_FALLTHROUGH macro has been added to SDL 2.0.18. Until 2.0.18 is
released, use it if it's available.
This commit is contained in:
Misa 2021-11-11 23:48:41 -08:00
parent 0c1f756af8
commit cd15ae0fdc
3 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
desktop_version/src/Graphics.cpp
View file

@ -12,6 +12,7 @@
#include "Map.h" #include "Map.h"
#include "Music.h" #include "Music.h"
#include "Screen.h" #include "Screen.h"
#include "TempSDLFallthrough.h"
#include "UtilityClass.h" #include "UtilityClass.h"
#include "Vlogging.h" #include "Vlogging.h"
@ -591,7 +592,7 @@ bool Graphics::next_wrap(
break; break;
case '\n': case '\n':
*start += 1; *start += 1;
VVV_fallthrough; SDL_FALLTHROUGH;
case '\0': case '\0':
return true; return true;
} }

22
desktop_version/src/TempSDLFallthrough.h Normal file
View file

@ -0,0 +1,22 @@
#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 */

10
desktop_version/src/UtilityClass.h
View file

@ -68,16 +68,6 @@ void _VVV_between(
sizeof(middle) \ sizeof(middle) \
) )
#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 MAYBE_FAIL(expr) \ #define MAYBE_FAIL(expr) \
do \ do \
{ \ { \