From ff01cc0212c951a2613f7ca5fb1e9579f17299cb Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Sat, 7 Nov 2015 16:54:10 +0100 Subject: Adding GFX_COMPILER_ARMCC and GFX_COMPILER_KEIL --- gfx.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gfx.h') diff --git a/gfx.h b/gfx.h index 48a92770..9afb3256 100644 --- a/gfx.h +++ b/gfx.h @@ -35,7 +35,12 @@ * @brief Generic 'true' boolean constant. */ #if !defined(TRUE) || defined(__DOXYGEN__) - #define TRUE -1 + // Keil/ARMCC requires some special threatment. can probably be generalized to always be 1. + #if (GFX_COMPILER == GFX_COMPILER_ARMCC) || (GFX_COMPILER == GFX_COMPILER_KEIL) + #define TRUE 1 + #else + #define TRUE -1 + #endif #endif /** @@ -57,7 +62,7 @@ #if GFX_NO_INLINE #define GFXINLINE #else - #if defined(__KEIL__) || defined(__C51__) + #if (GFX_COMPILER == GFX_COMPILER_ARMCC) || (GFX_COMPILER == GFX_COMPILER_KEIL) #define GFXINLINE __inline #else #define GFXINLINE inline -- cgit v1.2.3