luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-12 12:26:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/baedert/fallthrough-clang' into 'master'

Browse Source 
macros: Define G_GNUC_FALLTHROUGH for more compilers

See merge request GNOME/glib!1396
This commit is contained in:
Philip Withnall 2020-03-04 11:08:26 +00:00
commit 51953dd857
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glib/gmacros.h
View File

@ -532,7 +532,7 @@
/** /**
* G_GNUC_FALLTHROUGH: * G_GNUC_FALLTHROUGH:
* *
* Expands to the GNU C `fallthrough` statement attribute if the compiler is gcc. * Expands to the GNU C `fallthrough` statement attribute if the compiler supports it.
* This allows declaring case statement to explicitly fall through in switch * This allows declaring case statement to explicitly fall through in switch
* statements. To enable this feature, use `-Wimplicit-fallthrough` during * statements. To enable this feature, use `-Wimplicit-fallthrough` during
* compilation. * compilation.
@ -559,6 +559,8 @@
*/ */
#if __GNUC__ > 6 #if __GNUC__ > 6
#define G_GNUC_FALLTHROUGH __attribute__((fallthrough)) #define G_GNUC_FALLTHROUGH __attribute__((fallthrough))
#elif g_macro__has_attribute (fallthrough)
#define G_GNUC_FALLTHROUGH __attribute__((fallthrough))
#else #else
#define G_GNUC_FALLTHROUGH #define G_GNUC_FALLTHROUGH
#endif /* __GNUC__ */ #endif /* __GNUC__ */