From 3650b5d9b1364e56cb31429c7496612b93874adb Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Mon, 21 Jan 2019 16:09:05 +0200
Subject: [PATCH] Fix FDK_FALLTHROUGH for apple clang

In the apple branded version of clang, the [[clang::fallthrough]]
attribute isn't supported.

Directly exposing __has_cpp_attribute(clang::fallthrough) to the
preprocessor breaks when building in C mode with GCC, which forces
wrapping it in an extra layer of #ifdef __cplusplus.
---
 libSYS/include/machine_type.h | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/libSYS/include/machine_type.h b/libSYS/include/machine_type.h
index b66d5ad30..bd97669c3 100644
--- a/libSYS/include/machine_type.h
+++ b/libSYS/include/machine_type.h
@@ -382,13 +382,22 @@ it. Hence, a fully platform-independant way to use alignment is not supported.
 /**************************************************
  * Macros regarding static code analysis
  **************************************************/
-#if defined(__clang__)
+#ifdef __cplusplus
+#if !defined(__has_cpp_attribute)
+#define __has_cpp_attribute(x) 0
+#endif
+#if defined(__clang__) && __has_cpp_attribute(clang::fallthrough)
 #define FDK_FALLTHROUGH [[clang::fallthrough]]
-#elif defined(__GNUC__) && (__GNUC__ >= 7)
+#endif
+#endif
+
+#ifndef FDK_FALLTHROUGH
+#if defined(__GNUC__) && (__GNUC__ >= 7)
 #define FDK_FALLTHROUGH __attribute__((fallthrough))
 #else
 #define FDK_FALLTHROUGH
 #endif
+#endif
 
 #ifdef _MSC_VER
 /*