diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-11-12 18:43:20 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-11-12 18:43:20 +1000 |
| commit | 849369cceccfa3b9d70257306a8a93cfb852263e (patch) | |
| tree | 3bddeff9f88b994996a70c52660ba5fad6e76cb1 /gfx.h | |
| parent | d403294cb430c1dfb811880a3b8280a616c3d279 (diff) | |
| download | uGFX-849369cceccfa3b9d70257306a8a93cfb852263e.tar.gz uGFX-849369cceccfa3b9d70257306a8a93cfb852263e.tar.bz2 uGFX-849369cceccfa3b9d70257306a8a93cfb852263e.zip | |
Fix compiler detection for Keil uVision V5
Diffstat (limited to 'gfx.h')
| -rw-r--r-- | gfx.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |