From 629a0fd9c0db1cca07d42b5d3f873fc8cdb14379 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sat, 31 May 2014 21:39:36 +0000 Subject: [PATCH 1/1] {CRT] - Treat ARM like x64 in excpt.h - Give Clang the right __CRT_INLINE definition svn path=/trunk/; revision=63521 --- reactos/include/crt/_mingw.h | 2 +- reactos/include/crt/excpt.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/reactos/include/crt/_mingw.h b/reactos/include/crt/_mingw.h index 40b8b11ed39..4ee69fcb46b 100644 --- a/reactos/include/crt/_mingw.h +++ b/reactos/include/crt/_mingw.h @@ -56,7 +56,7 @@ #elif defined(_MSC_VER) # define __CRT_INLINE __inline #elif defined(__GNUC__) -# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) +# if defined(__clang__) || ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) # define __CRT_INLINE extern inline __attribute__((__always_inline__,__gnu_inline__)) # else # define __CRT_INLINE extern __inline__ __attribute__((__always_inline__)) diff --git a/reactos/include/crt/excpt.h b/reactos/include/crt/excpt.h index 355a077b738..23a4477527f 100644 --- a/reactos/include/crt/excpt.h +++ b/reactos/include/crt/excpt.h @@ -53,7 +53,7 @@ typedef enum _EXCEPTION_DISPOSITION _Inout_ struct _DISPATCHER_CONTEXT *_DispatcherContext, _In_ unsigned __int64 _GlobalPointer); -#elif defined(__x86_64) +#elif defined(__x86_64) || defined(_M_ARM) struct _EXCEPTION_RECORD; struct _CONTEXT; -- 2.17.1