Fix definition CYTHON_FALLTHROUGH in module setup utility code

7f7f7b18 · Lisandro Dalcin · 206e95f2 · 7f7f7b18
Commit 7f7f7b18 authored Oct 15, 2017 by Lisandro Dalcin
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

Cython/Utility/ModuleSetupCode.c Cython/Utility/ModuleSetupCode.c +10 -1

No files found.
--- a/Cython/Utility/ModuleSetupCode.c
+++ b/Cython/Utility/ModuleSetupCode.c
@@ -512,16 +512,25 @@
      #define CYTHON_FALLTHROUGH [[fallthrough]]
    #elif __has_cpp_attribute(clang::fallthrough)
      #define CYTHON_FALLTHROUGH [[clang::fallthrough]]
+    #elif __has_cpp_attribute(gnu::fallthrough)
+      #define CYTHON_FALLTHROUGH [[gnu::fallthrough]]
    #endif
  #endif

  #ifndef CYTHON_FALLTHROUGH
-    #if (defined(__GNUC__) || defined(__clang__)) && __has_attribute(fallthrough)
+    #if __has_attribute(fallthrough)
      #define CYTHON_FALLTHROUGH __attribute__((fallthrough))
    #else
      #define CYTHON_FALLTHROUGH
    #endif
  #endif
+
+  #if defined(__clang__ ) && defined(__apple_build_version__)
+    #if __apple_build_version__ < 7000000 /* Xcode < 7.0 */
+      #undef  CYTHON_FALLTHROUGH
+      #define CYTHON_FALLTHROUGH
+    #endif
+  #endif
 #endif

 /////////////// CInitCode ///////////////