diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-10-23 18:28:42 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-10-23 18:28:42 +1000 |
| commit | 00aeab86eb311f57d026931499ae5935c00857b1 (patch) | |
| tree | 44fe653eabd0362e2f97fbafdbdf96ffb4de08d2 /gfx.h | |
| parent | 29251f33bd106cfdc317fa00c10ecfb3a64fcc2d (diff) | |
| parent | 48a9d334b7a5b462b32c17a5fde07159deb4c280 (diff) | |
| download | uGFX-00aeab86eb311f57d026931499ae5935c00857b1.tar.gz uGFX-00aeab86eb311f57d026931499ae5935c00857b1.tar.bz2 uGFX-00aeab86eb311f57d026931499ae5935c00857b1.zip | |
Merge branch 'master' into Keil
Diffstat (limited to 'gfx.h')
| -rw-r--r-- | gfx.h | 22 |
1 files changed, 12 insertions, 10 deletions
@@ -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 * @{ |