From 53a837b2305153653c860490cf9a1b10efa9b3ee Mon Sep 17 00:00:00 2001 From: David Garske Date: Thu, 11 May 2017 15:52:32 -0700 Subject: [PATCH] Fix to only use FALL_THROUGH macro for GCC 7.1 or later. --- wolfssl/wolfcrypt/types.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/wolfssl/wolfcrypt/types.h b/wolfssl/wolfcrypt/types.h index f7bcd837c..7a1a57d77 100755 --- a/wolfssl/wolfcrypt/types.h +++ b/wolfssl/wolfcrypt/types.h @@ -162,13 +162,14 @@ #endif /* GCC 7 has new switch() fall-through detection */ - #ifndef FALL_THROUGH - #if defined(__GNUC__) - #define FALL_THROUGH __attribute__ ((fallthrough)) - #else - #define FALL_THROUGH + #if defined(__GNUC__) + #if ((__GNUC__ > 7) || ((__GNUC__ == 7) && (__GNUC_MINOR__ >= 1))) + #define FALL_THROUGH __attribute__ ((fallthrough)); #endif #endif + #ifndef FALL_THROUGH + #define FALL_THROUGH + #endif /* Micrium will use Visual Studio for compilation but not the Win32 API */ #if defined(_WIN32) && !defined(MICRIUM) && !defined(FREERTOS) && \