diff options
Diffstat (limited to 'src/stdafx.h')
| -rw-r--r-- | src/stdafx.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/stdafx.h b/src/stdafx.h index f13104a5b..6a3322345 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -113,7 +113,7 @@ #endif /* Stuff for GCC */ -#if defined(__GNUC__) || defined(__clang__) +#if defined(__GNUC__) || (defined(__clang__) && !defined(_MSC_VER)) # define NORETURN __attribute__ ((noreturn)) # define CDECL # define __int64 long long @@ -196,14 +196,10 @@ # define CDECL _cdecl # define WARN_FORMAT(string, args) -# ifndef __clang__ -# define FINAL sealed -# else -# define FINAL -# endif +# define FINAL final /* fallthrough attribute, VS 2017 */ -# if (_MSC_VER >= 1910) +# if (_MSC_VER >= 1910) || defined(__clang__) # define FALLTHROUGH [[fallthrough]] # else # define FALLTHROUGH |