- Treat ARM like x64 in excpt.h
- Give Clang the right __CRT_INLINE definition

svn path=/trunk/; revision=63521
This commit is contained in:
Timo Kreuzer 2014-05-31 21:39:36 +00:00
parent a5cffd2542
commit 629a0fd9c0
2 changed files with 2 additions and 2 deletions

View file

@ -56,7 +56,7 @@
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
# define __CRT_INLINE __inline # define __CRT_INLINE __inline
#elif defined(__GNUC__) #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__)) # define __CRT_INLINE extern inline __attribute__((__always_inline__,__gnu_inline__))
# else # else
# define __CRT_INLINE extern __inline__ __attribute__((__always_inline__)) # define __CRT_INLINE extern __inline__ __attribute__((__always_inline__))

View file

@ -53,7 +53,7 @@ typedef enum _EXCEPTION_DISPOSITION
_Inout_ struct _DISPATCHER_CONTEXT *_DispatcherContext, _Inout_ struct _DISPATCHER_CONTEXT *_DispatcherContext,
_In_ unsigned __int64 _GlobalPointer); _In_ unsigned __int64 _GlobalPointer);
#elif defined(__x86_64) #elif defined(__x86_64) || defined(_M_ARM)
struct _EXCEPTION_RECORD; struct _EXCEPTION_RECORD;
struct _CONTEXT; struct _CONTEXT;