From 48a9d334b7a5b462b32c17a5fde07159deb4c280 Mon Sep 17 00:00:00 2001 From: inmarket Date: Fri, 23 Oct 2015 18:24:49 +1000 Subject: Replace all inline definitions with GFXINLINE --- gfx.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'gfx.h') diff --git a/gfx.h b/gfx.h index eea3bce2..74b18ac2 100644 --- a/gfx.h +++ b/gfx.h @@ -51,21 +51,23 @@ #endif #endif +/* gfxconf.h is the user's project configuration for the GFX system. */ +#include "gfxconf.h" + /** - * __inline was standardized with C99. previous to that each compiler handles it differently. + * @brief Should various inline ugfx functions be non-inline. + * @details Defaults to FALSE */ -#undef INLINE -#ifdef __KEIL__ - #define INLINE __inline -#elif __C51__ - #define INLINE __inline +#if GFX_NO_INLINE + #define GFXINLINE #else - #define INLINE inline + #if defined(__KEIL__) || defined(__C51__) + #define GFXINLINE __inline + #else + #define GFXINLINE inline + #endif #endif -/* gfxconf.h is the user's project configuration for the GFX system. */ -#include "gfxconf.h" - /** * @name GFX sub-systems that can be turned on * @{ -- cgit v1.2.3