mirror of https://github.com/OpenTTD/OpenTTD.git
Fix: clang-cl build (#9018)
Remove macro redefinitions Add final and fallthrough attributes for clang-cl
This commit is contained in:
parent
31c5b8fe0f
commit
9aebfca083
10
src/stdafx.h
10
src/stdafx.h
|
@ -113,7 +113,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Stuff for GCC */
|
/* Stuff for GCC */
|
||||||
#if defined(__GNUC__) || defined(__clang__)
|
#if defined(__GNUC__) || (defined(__clang__) && !defined(_MSC_VER))
|
||||||
# define NORETURN __attribute__ ((noreturn))
|
# define NORETURN __attribute__ ((noreturn))
|
||||||
# define CDECL
|
# define CDECL
|
||||||
# define __int64 long long
|
# define __int64 long long
|
||||||
|
@ -196,14 +196,10 @@
|
||||||
|
|
||||||
# define CDECL _cdecl
|
# define CDECL _cdecl
|
||||||
# define WARN_FORMAT(string, args)
|
# define WARN_FORMAT(string, args)
|
||||||
# ifndef __clang__
|
# define FINAL final
|
||||||
# define FINAL sealed
|
|
||||||
# else
|
|
||||||
# define FINAL
|
|
||||||
# endif
|
|
||||||
|
|
||||||
/* fallthrough attribute, VS 2017 */
|
/* fallthrough attribute, VS 2017 */
|
||||||
# if (_MSC_VER >= 1910)
|
# if (_MSC_VER >= 1910) || defined(__clang__)
|
||||||
# define FALLTHROUGH [[fallthrough]]
|
# define FALLTHROUGH [[fallthrough]]
|
||||||
# else
|
# else
|
||||||
# define FALLTHROUGH
|
# define FALLTHROUGH
|
||||||
|
|
Loading…
Reference in New Issue