Fix fallthrough example macro to work with very old gcc versions

To deal with old gcc versions that do not have `__has_attribute`, the gcc manual suggest using this form. See https://gcc.gnu.org/onlinedocs/cpp/_005f_005fhas_005fattribute.html Signed-off-by: Lukas Backström (FKA Larsson) <[email protected]>
ossf · Oct 31, 2024 · 59bb863 · 59bb863
1 parent 852e821
commit 59bb863
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/docs/Compiler-Hardening-Guides/Compiler-Options-Hardening-Guide-for-C-and-C++.md b/docs/Compiler-Hardening-Guides/Compiler-Options-Hardening-Guide-for-C-and-C++.md
@@ -342,9 +342,12 @@ This warning flag does not have a performance impact. However, sometimes a fallt
 The C17 standard[^C2017] does not provide a mechanism to mark intentional fallthroughs. Different tools support different mechanisms for marking one, including attributes and comments in various forms[^Shafik15]. A portable way to mark one is to define a function-like macro named `fallthrough()` to mark an intentional fallthrough that adjusts to the relevant tool (e.g., compiler) mechanism. We suggest using this construct below, inspired by the keyword-like construct used by the Linux kernel version 6.4 and later[^Howlett23]. We suggest using a function call syntax instead so more editors and other tools will deal with it correctly:
 
 ~~~c
-#if __has_attribute(__fallthrough__)
-# define fallthrough()                    __attribute__((__fallthrough__))
-#else
+#ifdef __has_attribute
+# if __has_attribute(__fallthrough__)
+#  define fallthrough()                    __attribute__((__fallthrough__))
+# endif
+#endif
+#ifndef fallthrough
 # define fallthrough()                    do {} while (0)  /* fallthrough */
 #endif
 ~~~