cpp/openttd-patchpack/source Changeset - r25165:5990d158179d

Changeset - r25165:5990d158179d

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Wim Leflere - 3 years ago 2021-04-11 13:15:37
wim.leflere@gmail.com

Fix: clang-cl build (#9018)

Remove macro redefinitions
Add final and fallthrough attributes for clang-cl

1 file changed with 3 insertions and 7 deletions:

src/stdafx.h

0 comments (0 inline, 0 general)

src/stdafx.h

➞

Show inline comments

@@ @@ -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

0 comments (0 inline, 0 general)