From 849369cceccfa3b9d70257306a8a93cfb852263e Mon Sep 17 00:00:00 2001 From: inmarket Date: Thu, 12 Nov 2015 18:43:20 +1000 Subject: Fix compiler detection for Keil uVision V5 --- gfx.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gfx.h') diff --git a/gfx.h b/gfx.h index aeced09e..53c9b94f 100644 --- a/gfx.h +++ b/gfx.h @@ -286,7 +286,7 @@ #define GFX_COMPILER GFX_COMPILER_MINGW64 #elif defined(__CYGWIN__) #define GFX_COMPILER GFX_COMPILER_CYGWIN - #elif defined(__KEIL__) || defined(__C51__) + #elif defined(__KEIL__) || defined(__C51__) || (defined(__CC_ARM) && defined(__EDG__)) #define GFX_COMPILER GFX_COMPILER_KEIL #elif defined(__clang__) #define GFX_COMPILER GFX_COMPILER_CLANG @@ -392,7 +392,7 @@ #if GFX_NO_INLINE #define GFXINLINE #else - #if defined(__KEIL__) || defined(__C51__) + #if GFX_COMPILER == GFX_COMILER_KEIL #define GFXINLINE __inline #else #define GFXINLINE inline -- cgit v1.2.3